]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sun, 6 May 2012 19:39:59 +0000 (21:39 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 May 2012 19:39:59 +0000 (21:39 +0200)

Trivial merge