]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Sun, 15 Dec 2013 20:02:28 +0000 (21:02 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 15 Dec 2013 20:02:28 +0000 (21:02 +0100)

Trivial merge