Merge branch 'master' of github.com:datadesk/django-softhyphen

.travis.yml

@@ -6,13 +6,14 @@ python:
  - "2.7"
  - "3.2"
  - "3.3"
+ - "3.4"
 # List the versions of Django you'd like to test against
 env:
  - DJANGO_VERSION=1.2.7
  - DJANGO_VERSION=1.3.7
  - DJANGO_VERSION=1.4.10
  - DJANGO_VERSION=1.5.4
- - DJANGO_VERSION=1.6.1
+ - DJANGO_VERSION=1.6.2
 matrix:
   exclude:
     - python: "3.2"
@@ -27,6 +28,12 @@ matrix:
       env: "DJANGO_VERSION=1.3.7"
     - python: "3.3"
       env: "DJANGO_VERSION=1.2.7"
+    - python: "3.4"
+      env: "DJANGO_VERSION=1.4.10"
+    - python: "3.4"
+      env: "DJANGO_VERSION=1.3.7"
+    - python: "3.4"
+      env: "DJANGO_VERSION=1.2.7"
 # Tell it the things it will need to install when it boots
 install: 
    # Install the dependencies