Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 16 Jan 2013 00:17:51 +0000 (01:17 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 16 Jan 2013 00:17:51 +0000 (01:17 +0100)
commit10ba659d32518d2d09b12ada86a380798b378fe7
tree858b95798ad08518e1efc7b4a3df5d852df07782
parent5d0ae1011cdaf805d3d4b7cefb204f70dfd03689
parent7450e2fcc553f66844b34d5c062a965b8fca28c5
Merge branch 'master' into python3

Conflicts:
wrw/dispatch.py
wrw/dispatch.py
wrw/util.py