]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
null merge with 2.6
authorBarry Warsaw <barry@python.org>
Fri, 23 Aug 2013 17:38:02 +0000 (13:38 -0400)
committerBarry Warsaw <barry@python.org>
Fri, 23 Aug 2013 17:38:02 +0000 (13:38 -0400)

Trivial merge