]> granicus.if.org Git - python/commitdiff
#11865: Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 18 Apr 2011 07:14:49 +0000 (10:14 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 18 Apr 2011 07:14:49 +0000 (10:14 +0300)

Trivial merge