]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 22:00:36 +0000 (23:00 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 22:00:36 +0000 (23:00 +0100)

Trivial merge