Issue #24984: Merge 3.4 into 3.5

author Martin Panter <vadmium>

Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)

committer Martin Panter <vadmium>

Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)
author Martin Panter <vadmium>
Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)
committer Martin Panter <vadmium>
Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)
diff --cc Doc/library/socket.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Martin Panter <vadmium>
	Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)
committer	Martin Panter <vadmium>
	Wed, 9 Sep 2015 06:48:55 +0000 (06:48 +0000)
		1	2
Doc/library/socket.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history