]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Mon, 14 Oct 2013 14:53:07 +0000 (16:53 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 14 Oct 2013 14:53:07 +0000 (16:53 +0200)

Trivial merge