]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Mon, 9 Apr 2012 19:31:06 +0000 (21:31 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 9 Apr 2012 19:31:06 +0000 (21:31 +0200)

Trivial merge