]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Thu, 17 Oct 2013 17:52:33 +0000 (19:52 +0200)
committerGeorg Brandl <georg@python.org>
Thu, 17 Oct 2013 17:52:33 +0000 (19:52 +0200)

Trivial merge