Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
[civicrm-core.git] / templates /
drwxr-xr-x   ..
drwxr-xr-x - CRM
drwxr-xr-x - Civi