]> granicus.if.org Git - python/commitdiff
#12531: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 30 Jul 2011 18:26:40 +0000 (21:26 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 30 Jul 2011 18:26:40 +0000 (21:26 +0300)

Trivial merge