]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sat, 11 Aug 2012 08:59:45 +0000 (10:59 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 11 Aug 2012 08:59:45 +0000 (10:59 +0200)

Trivial merge