]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorBrett Cannon <brett@python.org>
Fri, 13 Mar 2015 16:50:16 +0000 (12:50 -0400)
committerBrett Cannon <brett@python.org>
Fri, 13 Mar 2015 16:50:16 +0000 (12:50 -0400)

Trivial merge