commit | d663cc4848bb42a5ef7d6d887ed3304d789d4141 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed May 27 18:32:41 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Wed May 27 18:32:41 2015 -0500 |
tree | 461b403e8ec8d0da7495571434651d662e87045b | |
parent | 6f05a20507823f345083d9a7cf79be267be87134 [diff] | |
parent | 68fe9aa58c139e3a6f8c9188760bb237added7d6 [diff] |
merge 3.4