]> granicus.if.org Git - python/commitdiff
#18687: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 13 Aug 2013 09:54:29 +0000 (12:54 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 13 Aug 2013 09:54:29 +0000 (12:54 +0300)

Trivial merge