From: Sean Purcell <me@seanp.xyz>
Date: Thu, 23 Feb 2017 23:23:24 +0000 (-0800)
Subject: Merge branch 'dev' into doc
X-Git-Tag: v1.1.4~1^2~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F564%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'dev' into doc
---

822c7187d4909de3d5df56d03a4af11d7c8d843e