]> granicus.if.org Git - python/commitdiff
#11843: Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 15:08:09 +0000 (18:08 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 15:08:09 +0000 (18:08 +0300)

Trivial merge