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

Trivial merge