]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Tue, 6 Nov 2012 22:51:42 +0000 (23:51 +0100)
committerStefan Krah <skrah@bytereef.org>
Tue, 6 Nov 2012 22:51:42 +0000 (23:51 +0100)

Trivial merge