]> granicus.if.org Git - python/commitdiff
#17346: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Mar 2013 13:21:14 +0000 (15:21 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Mar 2013 13:21:14 +0000 (15:21 +0200)

Trivial merge