From: Daniel Schregenberger <daniel@despite.ch>
Date: Fri, 26 Jan 2018 12:23:23 +0000 (+0100)
Subject: Merge pull request #12 from notandy/master
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=3dac7ce3dcce3b18a04c1542a70b8f2ad98bd9de;p=ympd.git

Merge pull request #12 from notandy/master

Merge recent commits to notandy/ympd master
---

3dac7ce3dcce3b18a04c1542a70b8f2ad98bd9de