]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sat, 16 Apr 2016 22:12:37 +0000 (15:12 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 16 Apr 2016 22:12:37 +0000 (15:12 -0700)

Trivial merge