]> granicus.if.org Git - python/commitdiff
#11379: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 22 Jan 2013 20:50:06 +0000 (22:50 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 22 Jan 2013 20:50:06 +0000 (22:50 +0200)

Trivial merge