Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 10098 Defaults.php
-rw-r--r-- 14079 Variables.php