Merge branch 'master' into python3

Conflicts:
	wrw/sp/xhtml.py

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 02e8dd6..a7debe6 100644 (file)
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -30,7 +30,7 @@ def head(title=None, css=None):
     return head
 
 class htmlformatter(util.formatter):
-    allowshort = set(["br", "hr", "img", "input"])
+    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)