]> granicus.if.org Git - python/commitdiff
#16760: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 25 Dec 2012 16:15:28 +0000 (18:15 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 25 Dec 2012 16:15:28 +0000 (18:15 +0200)

Trivial merge