Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
[civicrm-core.git] / tests / phpunit / CiviTest / civicrm.settings.local.php.txt
2013-03-01 Tim OttenImport from SVN (r45945, r596)