Merge branch 'master' of https://github.com/TimelessNL/packages into ser2net
authorMichael Heimpold <mhei@heimpold.de>
Thu, 28 Dec 2017 21:14:20 +0000 (22:14 +0100)
committerMichael Heimpold <mhei@heimpold.de>
Thu, 28 Dec 2017 21:14:20 +0000 (22:14 +0100)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Trivial merge