From: inikep <inikep@gmail.com>
Date: Wed, 15 Jun 2016 09:38:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
X-Git-Tag: v0.7.0^2~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F210%2Fhead;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
---

e98b66f8aef34d2c3a13f9cf0e6d0bc4264f2f5b