]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Thu, 2 Oct 2014 06:27:11 +0000 (08:27 +0200)
committerGeorg Brandl <georg@python.org>
Thu, 2 Oct 2014 06:27:11 +0000 (08:27 +0200)

Trivial merge