Switched setup.py to setuptools.
Skipped inclusion of scripts (pip will take care of that).
Changed setup.py to use find_packages.
Fixed typo in comment.
Fix typo in storage docs
Merge pull request #2171 from kwood/master

Fixed typo in storage docs
Merge pull request #2170 from numerodix/master

Fixed typo in comment.
Fixed #21747 -- Added {% elif %} to template topics guide.

Thanks gcc for the suggestion.
Fixed #21727 -- Added some links to help clarify topics/auth/default.txt

Thanks daGrevis for the suggestion.
Fixed #21768 -- Corrected TemplateView context section.

Thanks nedbatchelder for the report and claudep for the patch.
Fixed #21343 -- Noted many-to-many restrictions with intermediate model.

Thanks EvilDMP for the report.
Fixed #21740 -- Stopped using mutable default arguments in test client

Thanks Denver Coneybeare for the report and initial patch, and
Atala for another patch.
Fixed #21784: Correctly decode stdin input for migration defaults
Fixed typo in docstring.
Merge pull request #2176 from numerodix/master

Fixed typo in docstring.
Fixed #18285 -- Documented that bulk_create doesn't work with M2M relationships.
Fixed #16785 -- Documented some of the design decisions of the cache framework.

Thanks jamesp for the draft patch.
Fixed #21785: Bad handling of both auto_now and _add on deconstruct
Fixed #20052 -- Discouraged use of Jython given the current state of django-jython.

Thanks Josh Juneau (maintainer of django-jython) for the review.
Fixed #13116 -- Described scope of variables created by {% url ... as var %} syntax.

Thanks leif_p for the suggestion.