From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 4 Jun 2013 14:12:15 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=ca3dce3812e3fc65f4c021aa76ee1430b47ad3af;p=wrw.git

Merge branch 'master' into python3
---

ca3dce3812e3fc65f4c021aa76ee1430b47ad3af