]> granicus.if.org Git - python/commitdiff
#13278: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 28 Oct 2011 09:33:27 +0000 (12:33 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 28 Oct 2011 09:33:27 +0000 (12:33 +0300)

Trivial merge