From: Yann Collet <cyan@fb.com>
Date: Sat, 6 Jan 2018 11:40:58 +0000 (+0100)
Subject: Merge branch 'dev' into dubtlazy
X-Git-Tag: v1.3.4~1^2~87^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=658d6b858800938cbb473a004382cd8aac59ec62;p=thirdparty%2Fzstd.git

Merge branch 'dev' into dubtlazy
---

658d6b858800938cbb473a004382cd8aac59ec62