Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Feb 2012 16:00:30 +0000 (17:00 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Feb 2012 16:00:30 +0000 (17:00 +0100)
commit3614ca8353a5f2055fdcc086e6bc9dc993b49b42
tree50067fa4d3264dd24ea297326ddd7f41a8a29165
parentf9e9a7b5b192adfc7318e7f3ba0153668eef3bc1
parent1f61bf3134f3b46954ad012096c6ff3b398a74ef
Merge branch 'master' into python3

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