From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 9 May 2014 06:15:16 +0000 (+0200)
Subject: Merge branch 'master' into python2
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=2b4cce75e1eb09715b27fa94b63484c0a6f5a032;p=wrw.git

Merge branch 'master' into python2
---

2b4cce75e1eb09715b27fa94b63484c0a6f5a032