]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Mon, 24 Feb 2014 08:27:16 +0000 (09:27 +0100)
committerGeorg Brandl <georg@python.org>
Mon, 24 Feb 2014 08:27:16 +0000 (09:27 +0100)

Trivial merge