]> granicus.if.org Git - python/commitdiff
#16333: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 28 Nov 2012 22:36:42 +0000 (00:36 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 28 Nov 2012 22:36:42 +0000 (00:36 +0200)

Trivial merge