fixes bug 1031076 - Fix deprecation warnings on django.conf.urls.defaults (v 2)
Merge pull request #2232 from peterbe/bug-1031076-fix-deprecation-warnings-on-djangoconfurlsdefaults

fixes bug 1031076 - Fix deprecation warnings on django.conf.urls.defaults (v 2)