From: inikep <inikep@gmail.com>
Date: Fri, 4 Mar 2016 19:10:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev
X-Git-Tag: v0.6.0^2~17^2~86^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F139%2Fhead;p=thirdparty%2Fzstd.git

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

# Conflicts:
#	lib/zstd_compress.c
---

01060bc477e5a5821011eaa1361b1344fa8c877a