Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest
commitd80a95fa651c1a898898475e32f5ddefa0902ba9
authorCorvus Corax <corvuscorax@cybertrench.com>
Sat, 6 Jun 2015 12:55:15 +0000 (6 14:55 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Sat, 6 Jun 2015 12:55:15 +0000 (6 14:55 +0200)
treeb27e55ad1894d52699683bb09161a14ed126f528
parenta41ef23659c5a44a66761caf820837d59ef9fbf3
parent78921235cb5cf28ae6ad600e0d3276662374dc48
Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest