Merge branch 'master' into andrepl-master

Conflicts:
	debug_toolbar/middleware.py

1 files changed, 13 insertions, 0 deletions

diff --git a/debug_toolbar/utils/compat/db.py b/debug_toolbar/utils/compat/db.py
new file mode 100644
index 0000000..4273d9e
--- /dev/null
+++ b/debug_toolbar/utils/compat/db.py
@@ -0,0 +1,13 @@
+from django.conf import settings
+try:
+    from django.db import connections
+    dbconf = settings.DATABASES
+except ImportError:
+    # Compat with < Django 1.2
+    from django.db import connection
+    connections = {'default': connection}
+    dbconf = {
+        'default': {
+            'ENGINE': settings.DATABASE_ENGINE,
+        }
+    }
\ No newline at end of file