From: Carl Woffenden <cwoffenden@gmail.com>
Date: Fri, 23 Aug 2019 21:03:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: v1.4.4~1^2~71^2~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fcaa675e0de75a825f7c87364405bd640d6bbc0;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'upstream/dev' into dev
---

0fcaa675e0de75a825f7c87364405bd640d6bbc0