]> granicus.if.org Git - python/commitdiff
#16978: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Jan 2013 17:59:13 +0000 (19:59 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Jan 2013 17:59:13 +0000 (19:59 +0200)

Trivial merge