Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:00:01 +0000 (06:00 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:06:16 +0000 (06:06 +0100)
commit26648796c1d6c3c528ad7cdb108ecb086cfa5784
tree9031911a02e2efc8bb6f967a2b1b9493399e4911
parenta02127330452ddc72406bb1e2e3eeadefe773ebb
parenta573465ea03bd2a484252e87e0364d9376ec6bfc
Merge branch 'master' into python3

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