Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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

@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Edit';
?>