]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 17:24:00 +0000 (19:24 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 17:24:00 +0000 (19:24 +0200)

Trivial merge