]> granicus.if.org Git - python/commitdiff
Trunk merge.
authorBarry Warsaw <barry@python.org>
Fri, 6 Feb 2015 16:59:26 +0000 (11:59 -0500)
committerBarry Warsaw <barry@python.org>
Fri, 6 Feb 2015 16:59:26 +0000 (11:59 -0500)

Trivial merge