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
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