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

Merge branch 'master' into python3
---