Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 33 insertions, 0 deletions

diff --git a/rest_framework/tests/genericrelations.py b/rest_framework/tests/genericrelations.py
new file mode 100644
index 00000000..1d7e33bc
--- /dev/null
+++ b/rest_framework/tests/genericrelations.py
@@ -0,0 +1,33 @@
+from django.test import TestCase
+from rest_framework import serializers
+from rest_framework.tests.models import *
+
+
+class TestGenericRelations(TestCase):
+    def setUp(self):
+        bookmark = Bookmark(url='https://www.djangoproject.com/')
+        bookmark.save()
+        django = Tag(tag_name='django')
+        django.save()
+        python = Tag(tag_name='python')
+        python.save()
+        t1 = TaggedItem(content_object=bookmark, tag=django)
+        t1.save()
+        t2 = TaggedItem(content_object=bookmark, tag=python)
+        t2.save()
+        self.bookmark = bookmark
+
+    def test_reverse_generic_relation(self):
+        class BookmarkSerializer(serializers.ModelSerializer):
+            tags = serializers.ManyRelatedField(source='tags')
+
+            class Meta:
+                model = Bookmark
+                exclude = ('id',)
+
+        serializer = BookmarkSerializer(instance=self.bookmark)
+        expected = {
+            'tags': [u'django', u'python'],
+            'url': u'https://www.djangoproject.com/'
+        }
+        self.assertEquals(serializer.data, expected)