Merge remote-tracking branch 'tru7/linknx'
authorMichael Heimpold <mhei@heimpold.de>
Tue, 17 Mar 2015 20:20:29 +0000 (21:20 +0100)
committerMichael Heimpold <mhei@heimpold.de>
Tue, 17 Mar 2015 20:20:45 +0000 (21:20 +0100)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Trivial merge