From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 23 Dec 2012 05:10:13 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=c4126c8a6fff40b684cb3332728510725b1a3738;hp=c4126c8a6fff40b684cb3332728510725b1a3738;p=wrw.git

Merge branch 'master' into python3
---