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

Merge branch 'master' into python3
---

0d1857825b3d370a9249436f162300cc4862006c