]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 19:51:21 +0000 (15:51 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 19:51:21 +0000 (15:51 -0400)

Trivial merge