commit | e35a17af68fc315dff98ac63d60a623a63bdd6bd | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Mar 01 20:59:41 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Mar 01 20:59:41 2015 -0500 |
tree | 2dd96593703cfe38b5cf7c7a12badff784fde956 | |
parent | e49af341518ba22186fc523ec23ccff462ab439e [diff] | |
parent | 6e820c0548671847d873f6550ed9e5e7eaaaef89 [diff] |
merge 3.4