]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#20977: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 14:17:21 +0000 (17:17 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 14:17:21 +0000 (17:17 +0300)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge