]> granicus.if.org Git - python/commitdiff
merge 3.4 into default
authorGeorg Brandl <georg@python.org>
Sun, 12 Oct 2014 07:31:03 +0000 (09:31 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 12 Oct 2014 07:31:03 +0000 (09:31 +0200)

Trivial merge