Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 28 Dec 2013 05:37:03 +0000 (06:37 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 28 Dec 2013 05:37:03 +0000 (06:37 +0100)
commitcb66c33fdb75345266af29fc4063bf833100cca5
treecc2c3125e4fdecde05493fab18071b002ae17a67
parent2dc07f29089cd00d484e15a87e7eaa00e8c33f2f
parent7e9080af248b38edec371f117eb4749b09a3caca
Merge branch 'master' into python3

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