]> granicus.if.org Git - python/commitdiff
Merge
authorBrett Cannon <brett@python.org>
Thu, 22 Dec 2016 18:02:16 +0000 (10:02 -0800)
committerBrett Cannon <brett@python.org>
Thu, 22 Dec 2016 18:02:16 +0000 (10:02 -0800)

Trivial merge