Merge branch '2.2' of https://github.com/opentx/opentx into 2.2
commit8cc61e5a8a93b944883430a127e0fc44b4a9a055
author3djc <lesitewebdejc@hotmail.com>
Sat, 9 Jun 2018 09:59:11 +0000 (9 11:59 +0200)
committer3djc <lesitewebdejc@hotmail.com>
Sat, 9 Jun 2018 09:59:11 +0000 (9 11:59 +0200)
tree68b6ce5fc302a1061a33e3005156245925e69aa4
parentd58c660822f9a71a8f66f99273c489916f63e169
parentd460f005c626d99db59dd1c50bb9c24cd51228cf
Merge branch '2.2' of https://github.com/opentx/opentx into 2.2