Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19
[civicrm-core.git] / templates /
drwxr-xr-x   ..
drwxr-xr-x - CRM
drwxr-xr-x - Civi