]> granicus.if.org Git - python/commitdiff
merge heads
authorBarry Warsaw <barry@python.org>
Mon, 30 Sep 2013 19:58:28 +0000 (15:58 -0400)
committerBarry Warsaw <barry@python.org>
Mon, 30 Sep 2013 19:58:28 +0000 (15:58 -0400)

Trivial merge