From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 19 Mar 2017 17:15:32 +0000 (+0100)
Subject: Merge branch 'master' of git://git.dolda.net/wrw
X-Git-Url: http://www.dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=328e9684d09e1f415622ba3d7bc7fc446f54e1a1

Merge branch 'master' of git://git.dolda.net/wrw
---

328e9684d09e1f415622ba3d7bc7fc446f54e1a1