]> granicus.if.org Git - python/commitdiff
Merge with default
authorBrett Cannon <brett@python.org>
Mon, 10 Nov 2014 01:22:53 +0000 (20:22 -0500)
committerBrett Cannon <brett@python.org>
Mon, 10 Nov 2014 01:22:53 +0000 (20:22 -0500)

Trivial merge