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

Trivial merge