| commit | cff5ec6be36b0eef010d8b2afc444e60838217d0 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Jun 08 23:18:56 2016 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Jun 08 23:18:56 2016 -0700 |
| tree | c8293641f48268eccb6c1c96752fa7ba98033acf | |
| parent | b3e073cbb3af2999e6e589f55ec2fc8a109fdc14 [diff] | |
| parent | d5982d0433ec29fbacf9c05ddd5fd8ed884af6bd [diff] |
merge heads