Merge remote-tracking branch 'upstream/1.6-branch' into 1.6-branch
.travis.yml @@ -27,6 +27,7 @@ install: - travis_retry pip install tox - if [[ $TOXENV == 'py32' ]]; then travis_retry pip install "virtualenv<14" ; fi script: - travis_retry tox