]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 31 Aug 2014 21:22:27 +0000 (17:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 31 Aug 2014 21:22:27 +0000 (17:22 -0400)

Trivial merge