]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 29 May 2015 23:44:50 +0000 (18:44 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 29 May 2015 23:44:50 +0000 (18:44 -0500)

Trivial merge