]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #12885: Merge with 3.4, retaining commits reverted there.
authorJason R. Coombs <jaraco@jaraco.com>
Fri, 2 Sep 2016 03:29:04 +0000 (23:29 -0400)
committerJason R. Coombs <jaraco@jaraco.com>
Fri, 2 Sep 2016 03:29:04 +0000 (23:29 -0400)

Trivial merge