commit | 4c70293755ce8ea0adc5b224c714da2b7625d232 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 10:25:12 2016 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 10:25:12 2016 -0600 |
tree | 0de9b5bf2f7dd0132d08bfa1fb6216ea9647d814 | |
parent | 42bf8fc90158072ff0136a7c8bfa0b0dba3a70d6 [diff] | |
parent | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 [diff] |
merge 3.4