]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 7 Dec 2014 22:26:43 +0000 (17:26 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 7 Dec 2014 22:26:43 +0000 (17:26 -0500)

Trivial merge