Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest
commit191645c772e7110229c2fa99b73c688c9b4a13db
authorCorvus Corax <corvuscorax@cybertrench.com>
Fri, 5 Jun 2015 19:16:45 +0000 (5 21:16 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Fri, 5 Jun 2015 19:16:45 +0000 (5 21:16 +0200)
tree4345f50f8fbea676d67d6a48afb76813cd94bf4e
parent96f58605ec21bc2560474f7500598b1d69224044
parentb492b7e10a376c87fa1828e0ef8c6ac809291c25
Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest