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)
commitd38b200493b3ed263dbf10581d6d204462ed68c4
tree40490de89ec0eeb74e742ecf2d25b9a0a3cbaef9
parentbabf3e21cb06bf867e3ec98003d4a077090b8839
parent4c4dcf7a020ed52ea9d8d9048dbd62ffa3a7d54d
Merge branch 'master' into python3

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