commit | 22c108f0194e1e75e359b9861af28c33fe55a795 | [log] [tgz] |
---|---|---|
author | Jason R. Coombs <jaraco@jaraco.com> | Thu Sep 01 23:29:04 2016 -0400 |
committer | Jason R. Coombs <jaraco@jaraco.com> | Thu Sep 01 23:29:04 2016 -0400 |
tree | 07b4995251124be6da18ea7c80956f32ab15bc46 | |
parent | 0c7e42e8f72c30d5db0c696a9d6c7a5381451daa [diff] | |
parent | 79ae9671ff3db55da376af8ce2e56e6bf2b95c2b [diff] |
Issue #12885: Merge with 3.4, retaining commits reverted there.