Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 2 Sep 2013 01:26:39 +0000 (03:26 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 2 Sep 2013 01:26:39 +0000 (03:26 +0200)
commitbabf3e21cb06bf867e3ec98003d4a077090b8839
tree909b18dd43dc7a6bb650d408a237ab8ae1ad65da
parenta9a78095b1696f56946abfc7c284f86a21fdcc2d
parent9bc70dab473c7057a20d182ce8566ad0a70a7c5d
Merge branch 'master' into python3

Conflicts:
wrw/resp.py
wrw/util.py
wrw/cookie.py
wrw/form.py
wrw/proto.py
wrw/req.py
wrw/resp.py
wrw/session.py
wrw/sp/cons.py
wrw/util.py