Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 05:44:44 +0000 (07:44 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 05:44:44 +0000 (07:44 +0200)
commit920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b
tree08eeb55e5a37aba544e483b864158a6f57a23994
parent5218a0fd274ad9167d47b9c9929b089766cd2584
parentc6e56d74040e480cda56a66f5e52d2ceafce5ca7
Merge branch 'master' into python3

Conflicts:
wrw/cookie.py
wrw/cookie.py
wrw/req.py
wrw/session.py