]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 6 Jun 2015 02:03:46 +0000 (21:03 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 6 Jun 2015 02:03:46 +0000 (21:03 -0500)

Trivial merge