]> granicus.if.org Git - python/commitdiff
#12601: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 21 Jul 2011 08:17:05 +0000 (11:17 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 21 Jul 2011 08:17:05 +0000 (11:17 +0300)

Trivial merge