]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Clean merge
authorDavid Wolever <david@wolever.net>
Thu, 23 May 2013 21:51:58 +0000 (17:51 -0400)
committerDavid Wolever <david@wolever.net>
Thu, 23 May 2013 21:51:58 +0000 (17:51 -0400)

Trivial merge