From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 3 Apr 2014 03:33:34 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=8a7ba0dcff7734cce7328e487c1ab38712b84168;hp=8a7ba0dcff7734cce7328e487c1ab38712b84168;p=wrw.git

Merge branch 'master' into python3

Conflicts:
	wrw/form.py
---