]> granicus.if.org Git - python/commitdiff
#8040: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 27 Oct 2012 20:13:34 +0000 (23:13 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 27 Oct 2012 20:13:34 +0000 (23:13 +0300)

Trivial merge