Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 3 Apr 2014 03:33:34 +0000 (05:33 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 3 Apr 2014 03:33:34 +0000 (05:33 +0200)
commit8a7ba0dcff7734cce7328e487c1ab38712b84168
tree3252ee9cb2eb25db063a92bb88ee9162fb2dcacc
parent62113fc6dabec39f06a1f86f4ea6f73975f0acdf
parent820715646ba8a74897cae44036e03dc16528ec46
Merge branch 'master' into python3

Conflicts:
wrw/form.py
wrw/form.py