]> granicus.if.org Git - python/commitdiff
merge with 3.3.
authorGeorg Brandl <georg@python.org>
Sat, 6 Oct 2012 20:39:16 +0000 (22:39 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 6 Oct 2012 20:39:16 +0000 (22:39 +0200)

Trivial merge