End of part 6 - https://docs.djangoproject.com/en/1.5/intro/tutorial06/
Merge branch 'master' of github.com:davidfsmith/django-tutorial

Sorting out the incorrect commit message