]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Fri, 2 Nov 2012 06:34:52 +0000 (07:34 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 2 Nov 2012 06:34:52 +0000 (07:34 +0100)

Trivial merge