]> granicus.if.org Git - python/commitdiff
Merge branch 'release-2.7.14' into 2.7
authorBenjamin Peterson <benjamin@python.org>
Sat, 26 Aug 2017 20:42:29 +0000 (13:42 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 26 Aug 2017 20:42:29 +0000 (13:42 -0700)

Trivial merge