]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Wed, 4 Apr 2012 18:17:27 +0000 (20:17 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 4 Apr 2012 18:17:27 +0000 (20:17 +0200)

Trivial merge