]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Tue, 15 Apr 2014 20:41:36 +0000 (22:41 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 15 Apr 2014 20:41:36 +0000 (22:41 +0200)

Trivial merge