]> granicus.if.org Git - python/commitdiff
#16677: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 25 Dec 2012 13:47:41 +0000 (15:47 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 25 Dec 2012 13:47:41 +0000 (15:47 +0200)

Trivial merge