Merge tag 'upstream/1.4'

Upstream version 1.4

# gpg: Signature made Thu 30 Jan 2014 01:25:12 AM CET using RSA key ID 79F492F8
# gpg: Good signature from "Per Andersson <avtobiff@fripost.org>"
# gpg:                 aka "Per Andersson <avtobiff@debian.org>"
# gpg:                 aka "Per Andersson <avtobiff@gmail.com>"
# gpg:                 aka "Per Andersson <avtobiff@foo.nu>"

1 files changed, 12 insertions, 0 deletions

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..4d8e5f6
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27, py32, py33, pypy
+
+[testenv]
+commands = nosetests {posargs:-v}
+deps =
+    nose