| commit | 1378f7ca68329e6eebdd1b47bcb7b86fca2aff24 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Feb 17 22:18:20 2016 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Feb 17 22:18:20 2016 -0800 |
| tree | c1177b662e6a9dbc5bea45dcb120c425ee3e4d56 | |
| parent | f38c93fb7f9b8e127ff94e47beaad2f13dfdf11a [diff] | |
| parent | 94912727513ccab03567cfcab01732989c0ababc [diff] |
merge 3.4 (closes #25939)