Issue #25004: Merge 3.4 into 3.5

author Martin Panter <vadmium>

Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)

committer Martin Panter <vadmium>

Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)
author Martin Panter <vadmium>
Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)
committer Martin Panter <vadmium>
Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)
diff --cc Lib/test/test_mmap.py
Simple merge
diff --cc Misc/ACKS

index 240a20198552ba05b1a06bf8a4826be42a900ad8,88e55e022f4b8e282b138623b7b37965d7f2e987..e1afc728bf975ea5389dd3452a133a47867aabed
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -103,7 -100,7 +103,8 @@@ Mike Baye
   Samuel L. Bayer
   Donald Beaudry
   David Beazley
+ John Beck
+ +Ingolf Becker
   Neal Becker
   Robin Becker
   Torsten Becker
author	Martin Panter <vadmium>
	Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)
committer	Martin Panter <vadmium>
	Mon, 7 Sep 2015 04:04:40 +0000 (04:04 +0000)
		1	2
Lib/test/test_mmap.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history