]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sat, 30 May 2015 05:02:25 +0000 (00:02 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 30 May 2015 05:02:25 +0000 (00:02 -0500)

Trivial merge