]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sun, 7 Jun 2015 05:00:48 +0000 (00:00 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 7 Jun 2015 05:00:48 +0000 (00:00 -0500)

Trivial merge