commit | 91060f26f960ceb2ba9da5f86585836e7c2a8b2d | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:37:12 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:37:12 2016 -0700 |
tree | bf3c11c30b927965265fc3162bff79f786024853 | |
parent | f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec [diff] | |
parent | 5295532adb9d33970dd0f3370ab45c4e3bc3757c [diff] |
merge 3.4 (closes #27760)