# HG changeset patch
# User hodgestar
# Date 1395236290 0
# Node ID 4cbbf894c800880f508671ad0d7cf68b3131a073
# Parent  2e169deb0adc5ae33104998ed7b6d29ca11a3bed
Merge r1253 from trunk (add py34 to tox.ini).

diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py32,py33,pypy
+envlist = py25,py26,py27,py32,py33,py34,pypy
 [testenv]
 deps=
 setenv=