]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23053)
authorBenjamin Peterson <benjamin@python.org>
Mon, 15 Dec 2014 15:05:13 +0000 (10:05 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 15 Dec 2014 15:05:13 +0000 (10:05 -0500)

Trivial merge