Merge branch 'master' into andrepl-master

Conflicts:
	debug_toolbar/middleware.py

1 files changed, 14 insertions, 0 deletions

diff --git a/debug_toolbar/tests/urls.py b/debug_toolbar/tests/urls.py
new file mode 100644
index 0000000..7c99b03
--- /dev/null
+++ b/debug_toolbar/tests/urls.py
@@ -0,0 +1,14 @@
+"""
+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.contrib import admin
+
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    url(r'^execute_sql/$', 'debug_toolbar.tests.views.execute_sql'),
+)