]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 17 Mar 2014 21:20:50 +0000 (16:20 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 17 Mar 2014 21:20:50 +0000 (16:20 -0500)

Trivial merge