# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1417656293 21600
# Node ID 08bae2b1d2d17568f9253b1447156381cfc74c13
# Parent  0ffdb434d2dd250fd376d2c6745152efac2b3930# Parent  928b97ec55a7eaec58ffaaf9d54ca04553e618e7
Merge with main line.

diff -r 0ffdb434d2dd -r 08bae2b1d2d1 core/html.py
--- a/core/html.py	Tue Dec 02 21:16:46 2014 -0600
+++ b/core/html.py	Wed Dec 03 19:24:53 2014 -0600
@@ -10,7 +10,7 @@
     'comments': (
         [
             'a', 'b', 'blockquote', 'br', 'code', 'del', 'em',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr',
             'i', 'img', 'li', 'ol', 'p', 'pre', 'strong', 'ul',
         ],
         {
@@ -23,7 +23,7 @@
         [
             'a', 'b', 'blockquote', 'br', 'caption', 'center', 'code', 'col',
             'colgroup', 'dd', 'del', 'div', 'dl', 'dt', 'em',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr',
             'i', 'img', 'ins', 'li', 'ol', 'p', 'pre', 'small', 'strike',
             'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th',
             'thead', 'tr', 'tt', 'u', 'ul',