Merge branch 'master' of git://github.com/robhudson/django-debug-toolbar

Conflicts:

	debug_toolbar/templates/debug_toolbar/base.html

1 files changed, 13 insertions, 0 deletions

diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py
new file mode 100644
index 0000000..e0e4b7a
--- /dev/null
+++ b/debug_toolbar/urls.py
@@ -0,0 +1,13 @@
+"""
+URLpatterns for the debug toolbar. 
+
+These should not be loaded explicitly; the debug toolbar middleware will patch
+this into the urlconf for the request.
+"""
+from django.conf.urls.defaults import *
+from django.conf import settings
+
+urlpatterns = patterns('',
+    url(r'^__debug__/m/(.*)$', 'debug_toolbar.views.debug_media'),
+    url(r'^__debug__/sql_explain/$', 'debug_toolbar.views.sql_explain', name='sql_explain'),
+)