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

Trivial merge