commit | 40559cedb5883d76b308a13106eb807801834556 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Nov 03 22:42:08 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Nov 03 22:42:08 2015 -0800 |
tree | b70fa35deb2ad41e5505bfe9f7b164bebfad0fb4 | |
parent | 873cad2f16d8f16e4aa71960dbb2a89fa508e535 [diff] | |
parent | c72e66a0489ee53aaf89c677c5b709d30b359532 [diff] |
merge heads