]> granicus.if.org Git - python/commitdiff
merge 3.4
authorGeorg Brandl <georg@python.org>
Thu, 2 Oct 2014 10:39:02 +0000 (12:39 +0200)
committerGeorg Brandl <georg@python.org>
Thu, 2 Oct 2014 10:39:02 +0000 (12:39 +0200)

Trivial merge