]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 Oct 2014 03:58:37 +0000 (23:58 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 Oct 2014 03:58:37 +0000 (23:58 -0400)

Trivial merge