]> granicus.if.org Git - python/commitdiff
#14114: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 25 Feb 2012 17:26:39 +0000 (19:26 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 25 Feb 2012 17:26:39 +0000 (19:26 +0200)

Trivial merge