Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 4 Jun 2013 13:24:01 +0000 (15:24 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 4 Jun 2013 13:24:01 +0000 (15:24 +0200)
commit2a5a8ce70a0107b7bfd5bd3459ae4aae3a7558e2
treeb627999869c862431968e19636365d6906dad4c9
parent8fec8547c47c0452333972f554f328d0c8e61be2
parent24e514f00716cf4dd5fae2930d5f32e59bde2422
Merge branch 'master' into python3

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