Merge remote-tracking branch 'origin/master' into 2.4.0

Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini

1 files changed, 29 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index 2a6abdb7..19192308 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,22 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
-envlist = py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4
+envlist =
+       py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
+       py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
+       py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
+       py2.7-django1.4,py2.6-django1.4,
 
 [testenv]
 commands = py.test -q
 
+[testenv:py3.4-django1.7]
+basepython = python3.4
+deps = https://www.djangoproject.com/download/1.7b2/tarball/
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
+
 [testenv:py3.3-django1.7]
 basepython = python3.3
 deps = https://www.djangoproject.com/download/1.7b2/tarball/
@@ -33,6 +45,14 @@ deps = https://www.djangoproject.com/download/1.7b2/tarball/
        Pillow==2.3.0
        pytest-django==2.6.1
 
+[testenv:py3.4-django1.6]
+basepython = python3.4
+deps = Django==1.6.3
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
+
 [testenv:py3.3-django1.6]
 basepython = python3.3
 deps = Django==1.6.3
@@ -73,6 +93,14 @@ deps = Django==1.6.3
        Pillow==2.3.0
        pytest-django==2.6.1
 
+[testenv:py3.4-django1.5]
+basepython = python3.4
+deps = django==1.5.6
+       django-filter==0.7
+       defusedxml==0.3
+       Pillow==2.3.0
+       pytest-django==2.6.1
+
 [testenv:py3.3-django1.5]
 basepython = python3.3
 deps = django==1.5.6