]> granicus.if.org Git - python/commitdiff
#18267: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 8 Aug 2013 12:46:13 +0000 (15:46 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 8 Aug 2013 12:46:13 +0000 (15:46 +0300)

Trivial merge