]> granicus.if.org Git - python/commitdiff
#13138: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 9 Oct 2011 21:03:15 +0000 (00:03 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 9 Oct 2011 21:03:15 +0000 (00:03 +0300)

Trivial merge