Merge branch 'release/5.1.1__2'

Author: dyve

.travis.yml

@@ -9,10 +9,10 @@ python:
 
 # Django versions for matrix
 env:
-  - DJANGO_VERSION=1.4.16
-  - DJANGO_VERSION=1.5.11
-  - DJANGO_VERSION=1.6.8
-  - DJANGO_VERSION=1.7.1
+  - DJANGO_VERSION=1.4.18
+  - DJANGO_VERSION=1.5.12
+  - DJANGO_VERSION=1.6.10
+  - DJANGO_VERSION=1.7.3
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -28,19 +28,19 @@ script:
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO_VERSION=1.4.16
+      env: DJANGO_VERSION=1.4.18
     - python: "3.3"
-      env: DJANGO_VERSION=1.4.16
+      env: DJANGO_VERSION=1.4.18
     - python: "3.4"
-      env: DJANGO_VERSION=1.4.16
+      env: DJANGO_VERSION=1.4.18
     - python: "3.2"
-      env: DJANGO_VERSION=1.5.11
+      env: DJANGO_VERSION=1.5.12
     - python: "3.3"
-      env: DJANGO_VERSION=1.5.11
+      env: DJANGO_VERSION=1.5.12
     - python: "3.4"
-      env: DJANGO_VERSION=1.5.11
+      env: DJANGO_VERSION=1.5.12
     - python: "2.6"
-      env: DJANGO_VERSION=1.7.1
+      env: DJANGO_VERSION=1.7.3
 
 # Report to coveralls
 after_success: