]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Mar 2015 14:10:45 +0000 (09:10 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Mar 2015 14:10:45 +0000 (09:10 -0500)

Trivial merge