]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 12:38:58 +0000 (14:38 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 12:38:58 +0000 (14:38 +0200)

Trivial merge