]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Wed, 1 Oct 2014 17:42:09 +0000 (19:42 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 1 Oct 2014 17:42:09 +0000 (19:42 +0200)

Trivial merge