| commit | 45bde5d2ee58ac4887b034569c2ee930b3cfb8af | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Nov 11 22:45:22 2015 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Nov 11 22:45:22 2015 -0800 |
| tree | ee7a1a5928c47f94f8407c270d967c4a9526e081 | |
| parent | 86429bd1749e475145198b2d1498ef43b2597ab2 [diff] | |
| parent | a9dcdabccb1a1f7c76030c0b188ecaf7ab599e57 [diff] |
merge 3.4 (#25530)