| commit | 4a180a693f5e926784f65855734c4726839dcf48 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Feb 17 22:18:35 2016 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Feb 17 22:18:35 2016 -0800 |
| tree | 5f27b7811d1335961361f85103b57f8ebf0e72ea | |
| parent | 5ab2699c282a83523d753c8bd7278c8f2aa93608 [diff] | |
| parent | 1378f7ca68329e6eebdd1b47bcb7b86fca2aff24 [diff] |
merge 3.5 (closes #25939)