]> granicus.if.org Git - python/commitdiff
#18034: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 16:34:57 +0000 (19:34 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 16:34:57 +0000 (19:34 +0300)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge