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

author inikep <inikep@gmail.com>

Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)

committer inikep <inikep@gmail.com>

Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)
author inikep <inikep@gmail.com>
Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)
committer inikep <inikep@gmail.com>
Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)
diff --cc lib/zstd_opt.h
Simple merge
diff --cc programs/bench.c
Simple merge
author	inikep <inikep@gmail.com>
	Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)
committer	inikep <inikep@gmail.com>
	Mon, 11 Apr 2016 14:49:27 +0000 (16:49 +0200)
		1	2
lib/zstd_opt.h	patch \|	diff1 \|	diff2 \|	blob \| history
programs/bench.c	patch \|	diff1 \|	diff2 \|	blob \| history