]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Tue, 14 Aug 2012 17:52:04 +0000 (19:52 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Tue, 14 Aug 2012 17:52:04 +0000 (19:52 +0200)

Trivial merge