Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Sep 2013 22:41:53 +0000 (00:41 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 15 Sep 2013 22:41:53 +0000 (00:41 +0200)
Conflicts:
wrw/sp/cons.py
wrw/sp/xhtml.py


No differences found