]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 01:59:41 +0000 (20:59 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 01:59:41 +0000 (20:59 -0500)

Trivial merge