Fixed exception handling with YAML and XML parsers.
Merge pull request #1211 from robhudson/fix-six

Fixed exception handling with YAML and XML parsers.
Added @robhudson for work on #1211.  Thanks!
Merge pull request #1207 from erkarl/master

Updated OAuth2 authentication docs.
Improve handling of 'empty' values for ChoiceField

The empty value defaults back to '' (for backwards-compatibility) but
is changed automatically to None for ModelSerializers if the `null`
property is set on the db field.
Drop u'' prefix for python 3.x compatibility
Merge pull request #1214 from diox/choicefield-typed

Improve handling of 'empty' values for ChoiceField
Updated versions in tox and travis config
Fixed a regression with ValidationError under Django 1.6
Fix object creation with reverse M2M when related_name unspecified

It seems that field.related_query_name() does not return the related_name
for reverse M2M relations when related_name is not explicitly set in the M2M field
definition.

So, change to use obj.get_accessor_name(), where obj is an instance of
RelatedObject, as are returned by a model's
_meta.get_all_related_many_to_many_objects(), or as in the tuples returned by
_meta.get_all_m2m_objects_with_model().
Merge pull request #1216 from linovia/master

Fixed a regression with ValidationError under Django 1.6
Merge remote-tracking branch 'upstream/master' into versions
Exclude 1.4 on python 3
Merge pull request #1215 from brutasse/versions

Updated versions in tox and travis config
Merge pull request #1217 from benpbenp/master

Fix object creation with reverse M2M when related_name unspecified
Typo on api-guide/fields.md and serializers.py
Merge pull request #1219 from sepeth/fix-documentation-typo

Typo on api-guide/fields.md and serializers.py
Added drf-ujson-renderer to renderers docs

drf-ujson-renderer is a third party renderer that implements JSON renderering using UltraJSON
Merge pull request #1220 from hzy/patch-1

Added drf-ujson-renderer to renderers docs
Add queryset aggregates to allowed fields in OrderingFilter