]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Fri, 8 Nov 2013 19:37:01 +0000 (20:37 +0100)
committerStefan Krah <skrah@bytereef.org>
Fri, 8 Nov 2013 19:37:01 +0000 (20:37 +0100)

Trivial merge