]> granicus.if.org Git - python/commitdiff
merge 3.5 (#17167)
authorBenjamin Peterson <benjamin@python.org>
Tue, 22 Mar 2016 05:31:31 +0000 (22:31 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 22 Mar 2016 05:31:31 +0000 (22:31 -0700)

Trivial merge