From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 4 Jun 2013 13:31:09 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=8d8d1f703090499006efeb51299b8a267b00aa09;p=wrw.git

Merge branch 'master' into python3
---

8d8d1f703090499006efeb51299b8a267b00aa09