Merge branch 'master' into python3

Conflicts:
	wrw/sp/xhtml.py

diff --cc wrw/sp/xhtml.py
index 02e8dd666ed2656730c85688a6a3c007b6aa54e0,928dcd9ab46db41d88d3810a257adec64aeb0495..a7debe62f07968c9b9b8c8259816c4d096bef25a
--- 1/wrw/sp/xhtml.py
--- 2/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)