]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Mon, 2 Apr 2012 18:59:15 +0000 (20:59 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 2 Apr 2012 18:59:15 +0000 (20:59 +0200)

Trivial merge