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

Trivial merge