]> granicus.if.org Git - python/commitdiff
#13426: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Nov 2011 11:52:37 +0000 (13:52 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Nov 2011 11:52:37 +0000 (13:52 +0200)

Trivial merge