From: Yann Collet <cyan@fb.com>
Date: Thu, 28 Jun 2018 02:28:24 +0000 (-0700)
Subject: Merge branch 'dev' into travisTest
X-Git-Tag: v0.0.29~52^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63c5b7b159eb952fca5e8a473eeb1faf1032de6c;p=thirdparty%2Fzstd.git

Merge branch 'dev' into travisTest
---

63c5b7b159eb952fca5e8a473eeb1faf1032de6c