Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git...

Conflicts:

	geekigeeki.py

diff --git a/geekigeeki.py b/geekigeeki.py
index cf69d55e013c25335643290af2dde44b8820f91a..3b66445ab80b4665304db00481b344b31b4376e1 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -363,7 +363,7 @@ class PageFormatter:
         else:
             self.h_level = len(word) - 1
             link = permalink(self.line)
-            result = '<h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+            result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
         return result
 
     def _br_repl(self, word):