Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 23 Apr 2014 03:03:39 +0000 (05:03 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 23 Apr 2014 03:03:39 +0000 (05:03 +0200)
Conflicts:
wrw/form.py


No differences found