commit | f50cc9ad663a523901087282aff512fcb928d768 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu May 26 22:56:51 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Thu May 26 22:56:51 2016 -0700 |
tree | 61f4f6df03117e66e48034b4f995d0103a5762e2 | |
parent | 3f69f02792ee876ed0bd9cf9311bfb510889e164 [diff] | |
parent | 047ada4ef347b9557227685b9791d05451765cc6 [diff] |
merge 3.5