]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Thu, 31 May 2012 14:03:49 +0000 (16:03 +0200)
committerStefan Krah <skrah@bytereef.org>
Thu, 31 May 2012 14:03:49 +0000 (16:03 +0200)

Trivial merge