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

Merge branch 'dev' into adapt
---

b4e7f710555944d09045e5d96a2297d3ab2c7c75