Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest
commit96f58605ec21bc2560474f7500598b1d69224044
authorCorvus Corax <corvuscorax@cybertrench.com>
Fri, 5 Jun 2015 13:17:35 +0000 (5 15:17 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Fri, 5 Jun 2015 13:17:35 +0000 (5 15:17 +0200)
tree45f87a5d2437ea9f46bd94c379dcc64567e09332
parentffe9dde8d077ee861aab6fe7c8b587731ad7abd5
parentafc62f61aa82649108a868cccb29db6e4f67810f
Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest