From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 30 Aug 2012 08:20:25 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=f54a3465e5aaf03fe394d2702be6889cb06f37c6;hp=f54a3465e5aaf03fe394d2702be6889cb06f37c6;p=wrw.git

Merge branch 'master' into python3
---