Merge branch 'next' into corvuscorax/OP-1161_magnetometer-alarm
commitce8e9db3626a837a1834dd4b3d047c5312b886cf
authorCorvus Corax <corvuscorax@cybertrench.com>
Thu, 8 May 2014 19:16:21 +0000 (8 21:16 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Thu, 8 May 2014 19:16:21 +0000 (8 21:16 +0200)
tree5bf9a5898323761519f3361f32ffe79d8a8f738d
parent4cf667123cf34ce4cde758ee158846741ea923cf
parentb7f479cd6813bd6bd2c91e659143461bb111afbe
Merge branch 'next' into corvuscorax/OP-1161_magnetometer-alarm