]> granicus.if.org Git - python/commitdiff
Trunk merge.
authorBarry Warsaw <barry@python.org>
Fri, 22 Nov 2013 16:08:25 +0000 (11:08 -0500)
committerBarry Warsaw <barry@python.org>
Fri, 22 Nov 2013 16:08:25 +0000 (11:08 -0500)

Trivial merge