commit | 60e3f367a4fea840df2bb4cd85e007768433e0ad | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Aug 02 12:16:45 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Aug 02 12:16:45 2015 -0700 |
tree | 75e7a0893e11553cbe15ae35905fbaad8781aaf0 | |
parent | 32ba405ce5ad9ee7c18c96a264c5db42817f7cb1 [diff] | |
parent | f6b5cad3c37f5f8d2db5ded60c85b2beab360181 [diff] |
Merge 3.4 (#24217)