commit | 63eaf7b73daf917454a855041c4c99278787c7a1 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:53:11 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:53:11 2015 -0500 |
tree | bd2ea62021541d0f7860f1e47e2544d279789740 | |
parent | e54d5321cc527d0c97a95b90b2754f6494e7b3e1 [diff] | |
parent | 2e770ce9a09c129fed6646e5b30560e06a3b8183 [diff] |
merge heads