From: Nick Terrell Date: Fri, 2 Sep 2016 01:27:18 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/dev' into dev X-Git-Tag: v1.1.0~80^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa7e5aaabe1299cc9dab7a970974ab9e36f021c;p=thirdparty%2Fzstd.git Merge remote-tracking branch 'upstream/dev' into dev --- 7aa7e5aaabe1299cc9dab7a970974ab9e36f021c