From: Einar Jørgen Haraldseid <einar@haraldseid.net>
Date: Fri, 4 Nov 2016 11:53:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.slaskete.net:/srv/git/einar-bin
X-Git-Url: https://git.slaskete.net/einar-bin/commitdiff_plain/5b5a51570353e143f299b4fb520e0a0e673bc4f4?hp=-c

Merge branch 'master' of ssh://git.slaskete.net:/srv/git/einar-bin
---

5b5a51570353e143f299b4fb520e0a0e673bc4f4