Issue #22413: Merge StringIO doc from 3.4 into 3.5

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

Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)

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

Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)
diff --cc Doc/library/io.rst
Simple merge
diff --cc Modules/_io/_iomodule.h
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sat, 10 Oct 2015 10:15:21 +0000 (10:15 +0000)
		1	2
Doc/library/io.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_io/_iomodule.h	patch \|	diff1 \|	diff2 \|	blob \| history