]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sat, 24 Dec 2011 14:53:51 +0000 (15:53 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Sat, 24 Dec 2011 14:53:51 +0000 (15:53 +0100)

Trivial merge