Merge remote-tracking branch 'origin/laurent/OP-1466_Heli_config_tab' into rel-15.02
commit39ed1b0b451a84a6e1d056092218a5feccc18dd9
authorLaurent Lalanne <f5soh@free.fr>
Fri, 27 Feb 2015 22:05:47 +0000 (27 23:05 +0100)
committerLaurent Lalanne <f5soh@free.fr>
Fri, 27 Feb 2015 22:05:47 +0000 (27 23:05 +0100)
tree15ff4ed9e28b233decfefecd9697e3fde76fd010
parent2ea025a4c2c41ff18f7db6fef588110d656de7f2
parentfcb36b3639e6067478c02438906b2abefdaa235f
Merge remote-tracking branch 'origin/laurent/OP-1466_Heli_config_tab' into rel-15.02