]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Tue, 25 Sep 2012 15:10:02 +0000 (17:10 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 25 Sep 2012 15:10:02 +0000 (17:10 +0200)

Trivial merge