]> granicus.if.org Git - python/commitdiff
Merge branch 'release-2.7.14' into 2.7
authorBenjamin Peterson <benjamin@python.org>
Wed, 6 Sep 2017 01:06:20 +0000 (18:06 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 6 Sep 2017 01:06:20 +0000 (18:06 -0700)

Trivial merge