]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorBrett Cannon <brett@python.org>
Fri, 5 Dec 2014 23:11:15 +0000 (18:11 -0500)
committerBrett Cannon <brett@python.org>
Fri, 5 Dec 2014 23:11:15 +0000 (18:11 -0500)

Trivial merge