Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32
[civicrm-core.git] / templates /
drwxr-xr-x   ..
drwxr-xr-x - CRM