From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 13 May 2012 02:12:39 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=a878e812794ab36d47721a680a1bea5f4e1bcc45;p=wrw.git

Merge branch 'master' into python3
---

a878e812794ab36d47721a680a1bea5f4e1bcc45