Merge pull request #60 from dezede/translation

Adds a french translation.
Optimize NewBase test of six.with_metaclass() for Django 1.5+
cleanup: reorder tox envlist for readability
Prevent infinite recursion in Django 1.6
Be more specific in the condition before setting 'fields'
Fix missing ``alters_data = True`` annotations.
Merge pull request #69 from borgstrom/django16

Prevent infinite recursion in Django 1.6
Improve on #69, using setdefault() and update example project

Camp site rule; leave things tidier than you found them :)
update changelog too for #69
Add protection against mixed up ContentType tables
Fix subclass protection when ContentType is stale
bump version and changelog
Fixed typo: CopntentType
Merge pull request #73 from utapyngo/master

Fixed typo: CopntentType
Added to admin docs how to add polymorphic child model as inline.
Merge pull request #74 from vail130/master

Added to admin docs how to add polymorphic child model as inline.
Fixed tab spacing in admin.rst
Merge pull request #75 from vail130/master

Fixed tab spacing in admin.rst
Fix get_real_instance_class for proxy models
Merge pull request #77 from gnulnx/jf/polymorphic

Fix proposal for get_real_instance_class() for proxy models