]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 25 Feb 2015 21:47:20 +0000 (16:47 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 25 Feb 2015 21:47:20 +0000 (16:47 -0500)

Trivial merge