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

Trivial merge