commit | e45abae08f5513e6c4061a04199d67f13745ffa7 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:03:00 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:03:00 2016 -0800 |
tree | 2a802079a4e032859d39b9ee43ea7107a4b5d995 | |
parent | c3ea8d226851861ad7762c885e09ceae6ed62d3c [diff] | |
parent | b57eaeadff91fd1711289a43ecf2a13b54efde0a [diff] |
merge 3.5 (#26172)