]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Thu, 8 Dec 2011 21:30:18 +0000 (22:30 +0100)
committerStefan Krah <skrah@bytereef.org>
Thu, 8 Dec 2011 21:30:18 +0000 (22:30 +0100)

Trivial merge