]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 17:38:41 +0000 (19:38 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 17:38:41 +0000 (19:38 +0200)

Trivial merge