From: inikep <inikep@gmail.com>
Date: Tue, 10 May 2016 11:20:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
X-Git-Tag: v0.6.1^2~14^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed9a08538c0bddaf2f773014e5a098e3e66414eb;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts:
#	lib/common/util.h
#	programs/paramgrill.c
#	visual/2013/fullbench/fullbench.vcxproj.filters
#	visual/2013/fuzzer/fuzzer.vcxproj.filters
---

ed9a08538c0bddaf2f773014e5a098e3e66414eb