]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sat, 4 Jun 2016 05:38:47 +0000 (22:38 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 4 Jun 2016 05:38:47 +0000 (22:38 -0700)

Trivial merge