Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

author Hans Kristian Rosbach <hk-git@circlestorm.org>

Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)

committer Hans Kristian Rosbach <hk-git@circlestorm.org>

Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)
author Hans Kristian Rosbach <hk-git@circlestorm.org>
Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)
committer Hans Kristian Rosbach <hk-git@circlestorm.org>
Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)
diff --cc deflate.c
Simple merge
diff --cc trees.c
Simple merge
author	Hans Kristian Rosbach <hk-git@circlestorm.org>
	Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)
committer	Hans Kristian Rosbach <hk-git@circlestorm.org>
	Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)
		1	2
deflate.c	patch \|	diff1 \|	diff2 \|	blob \| history
trees.c	patch \|	diff1 \|	diff2 \|	blob \| history