Merge remote-tracking branch 'tru7/knxd'
authorMichael Heimpold <mhei@heimpold.de>
Sat, 7 Mar 2015 20:47:09 +0000 (21:47 +0100)
committerMichael Heimpold <mhei@heimpold.de>
Sat, 7 Mar 2015 20:47:29 +0000 (21:47 +0100)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Trivial merge