]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Wed, 29 Oct 2014 07:55:18 +0000 (08:55 +0100)
committerGeorg Brandl <georg@python.org>
Wed, 29 Oct 2014 07:55:18 +0000 (08:55 +0100)

Trivial merge