Merge branch 'master' of github.com:bruce-lyft/grafana

src/app/panels/text/module.html

@@ -3,8 +3,8 @@
   <markdown ng-show="ready && panel.mode == 'markdown'">
     {{panel.content}}
   </markdown>
-  <p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html="panel.content | striphtml | newlines">
+  <p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html-unsafe="panel.content | striphtml | newlines">
   </p>
-  <p ng-show="panel.mode == 'html'" ng-bind-html="panel.content">
+  <p ng-show="panel.mode == 'html'" ng-bind-html-unsafe="panel.content">
   </p>
-</div>
+</div>