Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

1
2
3
4
5
6
7
<?php
 
$clientdb_host            = '{hostname}';
$clientdb_user            = '{username}';
$clientdb_password        = '{password}';
 
?>