]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Sun, 19 Oct 2014 09:55:15 +0000 (11:55 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 19 Oct 2014 09:55:15 +0000 (11:55 +0200)

Trivial merge