Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

 interface/web/help/lib/lang/fr_faq_form.lng

@@ -1,6 +1,6 @@
<?php
$wb['faq_faq_txt'] = "Frequently Asked Questions";
$wb['faq_question_txt'] = "Question";
$wb['faq_answer_txt'] = "Answer";
$wb['faq_section_txt'] = "Section";
$wb['faq_faq_txt'] = 'Foire Aux Questions';
$wb['faq_question_txt'] = 'Question';
$wb['faq_answer_txt'] = 'Réponse';
$wb['faq_section_txt'] = 'Section';
?>