Merge branch 'frewsxcv-master' into v0.12.x

edschofield · edschofield · commit a8dd23c7446e · 2014-06-18T22:20:05.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python:
+  - "3.4"
   - "3.3"
   - "2.7"
   - "2.6"
diff --git a/setup.py b/setup.py
@@ -69,6 +69,7 @@
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
     "License :: OSI Approved",
     "License :: OSI Approved :: MIT License",
     "Development Status :: 4 - Beta",

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 language: python
 python:
 +  - "3.4"
   - "3.3"
   - "2.7"
   - "2.6"