| commit | 5db60aa84ea55b7b5623327551d41d51ea22c528 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 21:38:51 2016 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 21:38:51 2016 -0800 |
| tree | 4174a4b12592d7c998689e45679a9417ce373602 | |
| parent | 2900995edd00d86e1579e80c939ef67e7c83a5b4 [diff] | |
| parent | 3b1a8b3bbe2ff77975a13255c23a0f0bb4d55ebe [diff] |
merge 3.5 (closes #25672)