]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 13 May 2016 06:14:28 +0000 (23:14 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 13 May 2016 06:14:28 +0000 (23:14 -0700)

Trivial merge