]> granicus.if.org Git - python/commitdiff
Merge with 3.2
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 15 Mar 2011 17:21:03 +0000 (19:21 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 15 Mar 2011 17:21:03 +0000 (19:21 +0200)

Trivial merge