From: Yann Collet <cyan@fb.com>
Date: Mon, 17 Apr 2017 22:48:13 +0000 (-0700)
Subject: Merge branch 'dev' into compressionFlow
X-Git-Tag: v1.2.0^2~34^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c9437fdf7341538b9ceb9755ead7b240635fb6;p=thirdparty%2Fzstd.git

Merge branch 'dev' into compressionFlow
---

f0c9437fdf7341538b9ceb9755ead7b240635fb6