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)
commit919b8a4ff35da1fce73f238754ef376705c52e18
tree741342f095a720af7fb29c0d178d123e5172149f
parentdc590bea957bbffa808e6cf3f516d4ae9beda98a
parentfb5f9f27dcabe7fac75e3a69f820c42779539239
Merge branch 'master' into python3

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