]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sat, 6 Oct 2012 11:50:27 +0000 (13:50 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 6 Oct 2012 11:50:27 +0000 (13:50 +0200)

Trivial merge