]> granicus.if.org Git - python/commitdiff
#17771: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 17 Apr 2013 04:34:31 +0000 (07:34 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 17 Apr 2013 04:34:31 +0000 (07:34 +0300)

Trivial merge