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

Conflicts:
	debug_toolbar/media/debug_toolbar/css/toolbar.css
	debug_toolbar/media/debug_toolbar/css/toolbar.min.css
	debug_toolbar/media/debug_toolbar/js/toolbar.min.js
	debug_toolbar/middleware.py
	debug_toolbar/panels/sql.py
	debug_toolbar/templates/debug_toolbar/base.html
	debug_toolbar/templates/debug_toolbar/panels/sql.html

2 files changed, 3 insertions, 1 deletions

diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 5e8b652..c41749e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -5,6 +5,7 @@
 			<tr>
 				<th>{% trans "Level" %}</th>
 				<th>{% trans "Time" %}</th>
+				<th>{% trans "Channel" %}</th>
 				<th>{% trans "Message" %}</th>
 				<th>{% trans "Location" %}</th>
 			</tr>
@@ -14,6 +15,7 @@
 				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 					<td>{{ record.level }}</td>
 					<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
+					<td>{{ record.channel|default:"-" }}</td>
 					<td>{{ record.message }}</td>
 					<td>{{ record.file }}:{{ record.line }}</td>
 				</tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 1d8314e..50acd6e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -84,4 +84,4 @@
 	</table>
 {% else %}
 	<p>No SQL queries were recorded during this request.</p>
-{% endif %}
\ No newline at end of file
+{% endif %}