From: Yann Collet <yann.collet.73@gmail.com>
Date: Fri, 3 Jun 2016 21:08:04 +0000 (+0200)
Subject: Merge branch 'dev070' of github.com:Cyan4973/zstd into dev070
X-Git-Tag: v0.7.0^2~49^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a49c1f1782aceb3e7a2d3893e58763b6e6d8064f;p=thirdparty%2Fzstd.git

Merge branch 'dev070' of github.com:Cyan4973/zstd into dev070

Conflicts:
	lib/decompress/zstd_decompress.c
---

a49c1f1782aceb3e7a2d3893e58763b6e6d8064f