]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sun, 24 Jun 2012 18:02:59 +0000 (20:02 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 24 Jun 2012 18:02:59 +0000 (20:02 +0200)

Trivial merge