]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge remote-tracking branch 'refs/remotes/Cyan4973/master' into v05x
authorinikep <inikep@gmail.com>
Thu, 4 Feb 2016 20:46:33 +0000 (21:46 +0100)
committerinikep <inikep@gmail.com>
Thu, 4 Feb 2016 20:46:33 +0000 (21:46 +0100)

Trivial merge