]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 20:34:06 +0000 (16:34 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 20:34:06 +0000 (16:34 -0400)

Trivial merge