| commit | 86fb46d439bb9f73658ccbd36cbbb20ead795617 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 11:12:49 2016 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 11:12:49 2016 -0600 |
| tree | 42293cf06cb7f1731ec2ffc554e0738163105a46 | |
| parent | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 [diff] | |
| parent | 16b347b3de7f402dda9fdfcabb2e37f1229f2053 [diff] |
merge 3.3