summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-04-24 11:19:51 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-04-24 11:19:51 -0700
commit54613b68859353444538015ad7b117f7cb806014 (patch)
tree3f72bd80b0ec059683ffe1843019709bd141ac3b
parentc1434dbd242b5b4ab79a9fc6619c4d7f71e9d724 (diff)
parent417102dbea0fbe2f7df6c690ee610b2cc2c18b19 (diff)
Merge branch 'master' of github.com:paramiko/paramiko
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 55e3fe64..43c391dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py25,py26,py27,py32,py33
+envlist = py26,py27,py32,py33
[testenv]
commands = pip install --use-mirrors -q -r tox-requirements.txt