]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 7 Mar 2015 14:34:49 +0000 (09:34 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 7 Mar 2015 14:34:49 +0000 (09:34 -0500)

Trivial merge