]> granicus.if.org Git - python/commitdiff
branch merge
authorBrian Curtin <brian@python.org>
Thu, 21 Jun 2012 21:36:05 +0000 (16:36 -0500)
committerBrian Curtin <brian@python.org>
Thu, 21 Jun 2012 21:36:05 +0000 (16:36 -0500)

Trivial merge