]> granicus.if.org Git - python/commitdiff
#18380: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 6 Jul 2013 15:17:45 +0000 (17:17 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 6 Jul 2013 15:17:45 +0000 (17:17 +0200)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge