Merge: #13989: Document that GzipFile does not support text mode.

author Nadeem Vawda <nadeem.vawda@gmail.com>

Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)

committer Nadeem Vawda <nadeem.vawda@gmail.com>

Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)
author Nadeem Vawda <nadeem.vawda@gmail.com>
Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)
committer Nadeem Vawda <nadeem.vawda@gmail.com>
Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)
diff --cc Doc/library/gzip.rst
Simple merge
diff --cc Lib/gzip.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Nadeem Vawda <nadeem.vawda@gmail.com>
	Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)
committer	Nadeem Vawda <nadeem.vawda@gmail.com>
	Sat, 11 Feb 2012 21:54:51 +0000 (23:54 +0200)
		1	2
Doc/library/gzip.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/gzip.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history