]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:32:52 +0000 (20:32 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:32:52 +0000 (20:32 +0200)

Trivial merge