]> granicus.if.org Git - python/commitdiff
merge 3.5 (#28051)
authorBenjamin Peterson <benjamin@python.org>
Fri, 9 Sep 2016 19:46:49 +0000 (12:46 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 9 Sep 2016 19:46:49 +0000 (12:46 -0700)

Trivial merge