Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 14 Mar 2012 20:34:22 +0000 (21:34 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 14 Mar 2012 20:34:22 +0000 (21:34 +0100)
commit8b7cf2787e8cf2ee716c709d904f66c651cfed89
treeab83dfc36cfe856798a0576543a8166be5f3de72
parentc035fcc645f6bc177fe8da86058b21d24d253f72
parent5cb275b1fc089f21a70714851c5237498ab038e2
Merge branch 'master' into python3

Conflicts:
wrw/__init__.py
wrw/__init__.py
wrw/form.py
wrw/req.py