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

Trivial merge