commit | 3407473f91a931f96f358aa724ee84c49545da45 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 22:02:13 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 22:02:13 2016 -0800 |
tree | d92e67649b0aa337d474272832158f3faa6ae580 | |
parent | 5db60aa84ea55b7b5623327551d41d51ea22c528 [diff] | |
parent | e95fd0b411f0fb8a1725ed46ace9fd483e9581e4 [diff] |
merge 3.5 (#26046)