commit | f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:21:16 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:21:16 2016 -0700 |
tree | fa22d3d0a142786587fdfd0ccd5d871b3809f333 | |
parent | 9745ee0b444c92a23a1b8851f789044baa64dba5 [diff] | |
parent | 40a77c33819606b40ca04f680a06fcf31e2151a6 [diff] |
merge 3.4