]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sun, 1 Jan 2012 11:17:36 +0000 (12:17 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Sun, 1 Jan 2012 11:17:36 +0000 (12:17 +0100)

Trivial merge