| commit | 11a693d3304eb896de35733848b5bd9f2b5b4ab5 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Jun 13 23:41:40 2016 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Jun 13 23:41:40 2016 -0700 |
| tree | 0357fd4f94f5f8fd16f050bf8c77b619504b29e2 | |
| parent | 056f76d9782d54d069b7f6e967705f6fec4b4935 [diff] | |
| parent | 06d49bb89584921d17f3309530fc9544ef5b88c3 [diff] |
merge 3.4