]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 20 Oct 2014 06:36:09 +0000 (08:36 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 20 Oct 2014 06:36:09 +0000 (08:36 +0200)

Trivial merge