From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 22 Mar 2017 04:40:43 +0000 (+0100)
Subject: Merge branch 'master' into python2
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=bdc80241ffb5b50b1c9fb6500778e97b3f7170e6

Merge branch 'master' into python2
---

bdc80241ffb5b50b1c9fb6500778e97b3f7170e6