Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 8 Nov 2015 03:01:08 +0000 (04:01 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 8 Nov 2015 03:01:19 +0000 (04:01 +0100)
commitb6f62b898efdc272130d3dbdd6742c5b785e7c7d
tree578c02f2a10fba6e9c873ea7c4b142752f0e84b7
parent2b4cce75e1eb09715b27fa94b63484c0a6f5a032
parente1e1218fd66230e4ac8c7fca36a4c9a7b2496cf5
Merge branch 'master' into python2

Conflicts:
wrw/auth.py
wrw/form.py
wrw/proto.py
wrw/session.py
wrw/auth.py
wrw/form.py
wrw/proto.py
wrw/session.py
wrw/util.py