| commit | e46487b1331d50faffce480a4060bed1c4e634ae | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Mar 21 22:31:24 2016 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 21 22:31:24 2016 -0700 |
| tree | 57ce8479935ed1b7084bae4a7cdac24db73abacc | |
| parent | f6e9f47aa7a61507154d3d5f77b502c789c5b385 [diff] | |
| parent | b9869dfe353b116f3b8e208339c034a2ee5bc869 [diff] |
merge 3.4 (#17167)