Merge branch 'edge' into feature/Homing-and-Actuator
authorMichael Moon <triffid.hunter@gmail.com>
Wed, 19 Feb 2014 23:38:15 +0000 (10:38 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Wed, 19 Feb 2014 23:38:15 +0000 (10:38 +1100)

Trivial merge