From: Yann Collet <cyan@fb.com>
Date: Thu, 9 Aug 2018 22:57:36 +0000 (-0700)
Subject: Merge branch 'dev' into adapt
X-Git-Tag: v1.3.6^2~19^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d7b533f682cff83827108d3efd4ff45a5af50bd;p=thirdparty%2Fzstd.git

Merge branch 'dev' into adapt
---

3d7b533f682cff83827108d3efd4ff45a5af50bd