commit | 9046df065992c1763d92ed71882e3a45c8fb7437 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Apr 22 23:43:24 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Apr 22 23:43:24 2016 -0700 |
tree | 40225fa0868d648f452a70f02d281ba3ff94a3a5 | |
parent | 8b9eefc36399bb7c2e292386e9fa3ea251f85ccb [diff] | |
parent | 95b5f0ad7ee08c88b749bba2bf229a27f0e89b62 [diff] |
merge 3.5 (#26827)