Merge tag '1.7.1' into rebase_1.7.1
Conflicts: .gitignore setup.py src/zc/buildout/buildout.py src/zc/buildout/download.py src/zc/buildout/easy_install.py src/zc/buildout/testing.py src/zc/buildout/tests.py
Showing
.travis.yml
0 → 100644
Makefile
0 → 100644
This diff is collapsed.
Please register or sign in to comment