]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 6 May 2012 10:06:24 +0000 (12:06 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 May 2012 10:06:24 +0000 (12:06 +0200)

Trivial merge