]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 13 Mar 2011 00:29:11 +0000 (02:29 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 13 Mar 2011 00:29:11 +0000 (02:29 +0200)

Trivial merge