]> granicus.if.org Git - python/commitdiff
#11897: Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 21 Apr 2011 11:49:56 +0000 (14:49 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 21 Apr 2011 11:49:56 +0000 (14:49 +0300)

Trivial merge