]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 08:29:48 +0000 (09:29 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 08:29:48 +0000 (09:29 +0100)

Trivial merge