From: Einar Jørgen Haraldseid <einar@haraldseid.net>
Date: Tue, 7 Apr 2015 21:25:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin
X-Git-Url: https://git.slaskete.net/einar-bin/commitdiff_plain/858e662f521c505898e437c54615c56faae32aee?ds=inline

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

858e662f521c505898e437c54615c56faae32aee