Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-24-22-26-45
[civicrm-core.git] / CRM / Core / Smarty / resources /
drwxr-xr-x   ..
-rw-r--r-- 2942 String.php