Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/client/lib/lang/de_client_message.lng

@@ -15,5 +15,6 @@
$wb['all_clients_resellers_txt'] = 'Alle Kunden und Reseller';
$wb['all_clients_txt'] = 'Alle Kunden';
$wb['variables_txt'] = 'Variablen:';
$wb['gender_m_txt'] = 'Herr';
$wb['gender_f_txt'] = 'Frau';
?>