]> granicus.if.org Git - python/commitdiff
#11997: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 5 May 2011 11:21:55 +0000 (14:21 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 5 May 2011 11:21:55 +0000 (14:21 +0300)

Trivial merge