From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 23 Apr 2014 03:03:39 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=69a029dcfdd72f66a31aadcd4517bb13d5803127;hp=69a029dcfdd72f66a31aadcd4517bb13d5803127;p=wrw.git

Merge branch 'master' into python2

Conflicts:
	wrw/form.py
---