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

Trivial merge