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)
commit69a029dcfdd72f66a31aadcd4517bb13d5803127
tree43eb2eada1306e7966ea92d937c4bb6ebf9cc176
parent6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6
parent118fcef771da97a873c57d8c45f8fd6e0bd1c9b0
Merge branch 'master' into python2

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