merge
Merge branch 'master' of github.com:pydanny/django-admin2