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

Trivial merge