From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 30 Aug 2012 14:14:19 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=825ac8f0cafe69dfb61c127556ef50f0f92e6168;p=wrw.git

Merge branch 'master' into python3
---

825ac8f0cafe69dfb61c127556ef50f0f92e6168