]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 9 Mar 2015 14:37:59 +0000 (10:37 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 9 Mar 2015 14:37:59 +0000 (10:37 -0400)

Trivial merge