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)
commit3756129d9cc847906272cc65f99db6f1a796e081
treec46c41ad1609b7d8492757e1f9cdaceb3b8987a3
parent98622bb83ee29d94623aec4b3a1d87913cafd4c8
parent6f78dcc31d1ba4379003770d68831557423b7b7a
Merge remote-tracking branch 'tru7/linknx'

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