]> granicus.if.org Git - python/commitdiff
#4711: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 16:29:16 +0000 (18:29 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 16:29:16 +0000 (18:29 +0200)

Trivial merge