Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:46:16 +0000 (06:46 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:46:16 +0000 (06:46 +0100)
commit5d0ae1011cdaf805d3d4b7cefb204f70dfd03689
tree28f9a3dbd652259359f21670d436dc7a4e00d0d7
parentc4126c8a6fff40b684cb3332728510725b1a3738
parentaf9ecd26fa64bc8f9890952f2d9e6b6147650416
Merge branch 'master' into python3

Conflicts:
wrw/wmako.py
wrw/wmako.py