Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
<?php
$wb['faq_faq_txt'] = 'Frequently Asked Questions';
$wb['faq_question_txt'] = 'Frage';
$wb['faq_answer_txt'] = 'Antwort';
$wb['faq_section_txt'] = 'Kategorie';
?>