From: Yann Collet <cyan@fb.com>
Date: Fri, 15 Jun 2018 00:42:10 +0000 (-0400)
Subject: Merge branch 'dev' into huf_rename
X-Git-Tag: v1.3.5~3^2~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1191%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'dev' into huf_rename
---

d8462ecba25538afd13d685027eac263787a519e