Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 03:19:40 +0000 (05:19 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 5 Jul 2012 03:19:40 +0000 (05:19 +0200)
commitad5b93034c1c28f0f4deab4c1b62cb2d6a869f81
tree3dad8df1c0a3207508d518d9ed532157be106902
parent09dd8abaebe7bee21670535ae04ec37f0fa644ab
parent4eca11182344470d2146b13ddeb15b263407b1a2
Merge branch 'master' into python3

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