edx/edx-platform — pull request #6016 by cpennington (2014-11-21 14:06:06+00:00)
Title: Upgrade django-debug-toolbar to 1.2.2

This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel

[PLAT-298]