]> granicus.if.org Git - python/commitdiff
#19238, #19289: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 20 Oct 2013 23:53:30 +0000 (02:53 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 20 Oct 2013 23:53:30 +0000 (02:53 +0300)

Trivial merge