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

Trivial merge