]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:25:27 +0000 (21:25 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 26 May 2015 02:25:27 +0000 (21:25 -0500)

Trivial merge