Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 27 Aug 2012 04:17:30 +0000 (06:17 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 27 Aug 2012 04:17:30 +0000 (06:17 +0200)
commit3e91bb195838a6c561358a44f654f41f46e9c95f
treeaf3b0f4c67ad499ba645c22820bbefdc449849db
parent0d1857825b3d370a9249436f162300cc4862006c
parentd11a27e202a7c7a4698778e5f30bbe2c9f9a56fe
Merge branch 'master' into python3

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