From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 27 Aug 2012 04:17:30 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=3e91bb195838a6c561358a44f654f41f46e9c95f

Merge branch 'master' into python3

Conflicts:
	wrw/sp/xhtml.py
---

3e91bb195838a6c561358a44f654f41f46e9c95f
diff --cc wrw/sp/xhtml.py
index 02e8dd6,928dcd9..a7debe6
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@@ -30,7 -30,7 +30,7 @@@ def head(title=None, css=None)
      return head
  
  class htmlformatter(util.formatter):
-     allowshort = set(["br", "hr", "img", "input"])
 -    allowshort = set([u"br", u"hr", u"img", u"input", u"meta", u"link"])
++    allowshort = set(["br", "hr", "img", "input", "meta", "link"])
      def element(self, el, **extra):
          if el.name in self.allowshort:
              super(htmlformatter, self).element(el, **extra)