]> granicus.if.org Git - python/commitdiff
Merge
authorBarry Warsaw <barry@python.org>
Fri, 6 Feb 2015 17:00:57 +0000 (12:00 -0500)
committerBarry Warsaw <barry@python.org>
Fri, 6 Feb 2015 17:00:57 +0000 (12:00 -0500)

Trivial merge