fix merge of mavlink submodule

This commit is contained in:
Thomas Gubler
2014-07-08 11:16:19 +02:00
parent 0d7ae9276e
commit 2c74babafc