]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Fri, 30 Mar 2012 12:19:21 +0000 (14:19 +0200)
committerStefan Krah <skrah@bytereef.org>
Fri, 30 Mar 2012 12:19:21 +0000 (14:19 +0200)

Trivial merge