]> granicus.if.org Git - python/commitdiff
#17686: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 13 Apr 2013 17:07:58 +0000 (20:07 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 13 Apr 2013 17:07:58 +0000 (20:07 +0300)

Trivial merge