]> granicus.if.org Git - python/commitdiff
#14089: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 29 Feb 2012 12:06:56 +0000 (14:06 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 29 Feb 2012 12:06:56 +0000 (14:06 +0200)

Trivial merge