Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

1
2
3
4
5
6
7
8
<?php
$wb["list_head_txt"] = 'Webdav-User';
$wb["active_txt"] = 'Active';
$wb["server_id_txt"] = 'Server';
$wb["parent_domain_id_txt"] = 'Website';
$wb["username_txt"] = 'Username';
$wb["add_new_record_txt"] = 'Add new Webdav-User';
?>