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)
Conflicts:
wrw/form.py


No differences found