]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sun, 25 Dec 2011 16:07:38 +0000 (17:07 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Sun, 25 Dec 2011 16:07:38 +0000 (17:07 +0100)

Trivial merge