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

Trivial merge