]> granicus.if.org Git - python/commitdiff
merge 3.4 (#24049)
authorBenjamin Peterson <benjamin@python.org>
Fri, 24 Apr 2015 16:02:53 +0000 (12:02 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 24 Apr 2015 16:02:53 +0000 (12:02 -0400)

Trivial merge