]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Thu, 5 Apr 2012 14:25:21 +0000 (16:25 +0200)
committerStefan Krah <skrah@bytereef.org>
Thu, 5 Apr 2012 14:25:21 +0000 (16:25 +0200)

Trivial merge