]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 18:46:15 +0000 (20:46 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 18:46:15 +0000 (20:46 +0200)

Trivial merge