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)
commit71ea9e8eacfbc8993777edbf17f4ce0543911ae4
tree449118e1c04928465513424bb5e88930abb1ce08
parent065172d7b180f7c69708817408a1940199531f58
parente190a22c6aec7a421cd1f35985fe8acf9a68c08b
Merge branch 'master' of https://github.com/TimelessNL/packages into ser2net

Signed-off-by: Michael Heimpold <mhei@heimpold.de>