| commit | 40cfc1e33b5db067f6ac85b9fa3fc3cbe6b2970b | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jun 03 22:38:37 2016 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jun 03 22:38:37 2016 -0700 |
| tree | a1d4f28b58a708375437c4381d7247406370704c | |
| parent | 3da82067c70c92a5edbf75ec6d44cbc34cd5ad82 [diff] | |
| parent | 3ee6270262627b157bb69169c0fe78855716efdb [diff] |
merge heads