Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 11 Jan 2014 04:46:51 +0000 (05:46 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 11 Jan 2014 04:46:51 +0000 (05:46 +0100)
1  2 
wrw/dispatch.py

diff --cc wrw/dispatch.py
Simple merge