Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 16:18:22 +0000 (18:18 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 16:18:22 +0000 (18:18 +0200)
1  2 
wrw/proto.py

diff --cc wrw/proto.py
Simple merge