| commit | c9d4c60a562f66ca73509ef682e88a1726b860f8 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:09:07 2017 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:09:07 2017 -0600 |
| tree | 688674287d981d2b133c2bcf90956ba5fdf18c2c | |
| parent | 4365833d11fb8e0139d9e8a543692e963a749e38 [diff] | |
| parent | ff0e3b7a54673791bb724be9679c85a4feb7468c [diff] |
merge heads