]> granicus.if.org Git - python/commitdiff
#17653: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 12 Apr 2013 16:19:45 +0000 (19:19 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 12 Apr 2013 16:19:45 +0000 (19:19 +0300)

Trivial merge