From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 5 Jul 2012 04:24:25 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=388ed0605123d84cf2ed23dcd8a89de1b749a7b1;p=wrw.git

Merge branch 'master' into python3
---

388ed0605123d84cf2ed23dcd8a89de1b749a7b1