]> granicus.if.org Git - python/commitdiff
#12072: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 20 May 2011 12:06:58 +0000 (15:06 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 20 May 2011 12:06:58 +0000 (15:06 +0300)

Trivial merge