]> granicus.if.org Git - python/commitdiff
#17881: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 30 Apr 2013 13:34:30 +0000 (16:34 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 30 Apr 2013 13:34:30 +0000 (16:34 +0300)

Trivial merge