commit | 09479d0b946bd711c45fc221edacc53dcd506637 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon May 25 21:25:09 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon May 25 21:25:09 2015 -0500 |
tree | 2f2f93faf9274219881cddb58a26653e2ad37c40 | |
parent | 24d262af0b16f76415baa6187c8892de1682c8a6 [diff] | |
parent | 82d8f06fcd1926906de0ee5ff1154476b7a37ae8 [diff] |
merge 3.4