Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
<?php
$wb['page_head_txt'] = 'ISPConfig Tools';
$wb['page_desc_txt'] = 'Change user settings';
?>