Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09
[civicrm-core.git] / templates /
drwxr-xr-x   ..
drwxr-xr-x - CRM
drwxr-xr-x - Civi