From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 28 Aug 2012 00:58:16 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=a3bc782ed6e7fc98a61157c9c1bac486f787372e;p=wrw.git

Merge branch 'master' into python3
---

a3bc782ed6e7fc98a61157c9c1bac486f787372e