]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 07:00:01 +0000 (08:00 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 28 Oct 2012 07:00:01 +0000 (08:00 +0100)

Trivial merge