]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 18:01:14 +0000 (20:01 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 18:01:14 +0000 (20:01 +0200)

Trivial merge