]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge #23756.
authorStefan Krah <skrah@bytereef.org>
Sat, 8 Aug 2015 12:34:17 +0000 (14:34 +0200)
committerStefan Krah <skrah@bytereef.org>
Sat, 8 Aug 2015 12:34:17 +0000 (14:34 +0200)

Trivial merge