Issue #26244: Merge zlib documentation from 3.5

author Martin Panter <vadmium+py@gmail.com>

Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)
author Martin Panter <vadmium+py@gmail.com>
Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)
diff --cc Misc/ACKS
Simple merge
diff --cc Modules/zlibmodule.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Wed, 3 Feb 2016 07:52:06 +0000 (07:52 +0000)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/zlibmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history