Improve custom filtering example
Unicode string fix
Fix py3k compat with functools.reduce
added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base
fix test case to work with Python 3 and make it more explicit
Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency.
Added django-viewsets to credits.  Refs #738.
Allow for missing non-required nested objects.

Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null.
Updated release notes
Fix Django 1.3 compat with routers
SearchFilter may be comma and/or whitespace seperated
More docs on SearchFilter
Rename filter tests
Added OrderingFilter
Added OrderingFilter
Merge branch 'master' of https://github.com/avinash240/django-rest-framework
Fix filter test renaming
Updated release notes
Added @avinash240 for bugfix #822
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework