From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 5 Feb 2012 17:36:55 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=933f6cee99a3dd33b67fe463f4499aa19e703f79;p=wrw.git

Merge branch 'master' into python3
---

933f6cee99a3dd33b67fe463f4499aa19e703f79