| commit | 1da0612e70f64af89340630436483366a0e86ea4 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:52:33 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:52:33 2015 -0500 |
| tree | 2a89038b20d4445ab54c857077fa0b39581dc818 | |
| parent | 2a48a6eb335e496220aa75f6daae5b56e231b8e4 [diff] | |
| parent | f1ce6deb4111267ab8de5cd6430c1bcebe1084bc [diff] |
merge heads