]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 7 Oct 2014 01:11:25 +0000 (21:11 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 7 Oct 2014 01:11:25 +0000 (21:11 -0400)

Trivial merge