Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Dec 2013 09:51:48 +0000 (10:51 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Dec 2013 09:51:48 +0000 (10:51 +0100)
Conflicts:
wrw/sp/util.py
wrw/sp/xhtml.py


No differences found