]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Wed, 15 Aug 2012 19:37:56 +0000 (21:37 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Wed, 15 Aug 2012 19:37:56 +0000 (21:37 +0200)

Trivial merge