]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 16:31:02 +0000 (11:31 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 5 Nov 2014 16:31:02 +0000 (11:31 -0500)

Trivial merge