]> granicus.if.org Git - python/commitdiff
#16154: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Jan 2013 07:12:49 +0000 (09:12 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Jan 2013 07:12:49 +0000 (09:12 +0200)
1  2 
Misc/ACKS

diff --cc Misc/ACKS
Simple merge