From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 28 Nov 2012 04:51:07 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=b904defe1135d64ae7035b8903c221b0f022b98f;p=wrw.git

Merge branch 'master' into python3
---

b904defe1135d64ae7035b8903c221b0f022b98f