]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Fri, 8 Jun 2012 16:55:22 +0000 (18:55 +0200)
committerStefan Krah <skrah@bytereef.org>
Fri, 8 Jun 2012 16:55:22 +0000 (18:55 +0200)

Trivial merge