Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50
[civicrm-core.git] / js / view /
drwxr-xr-x   ..
-rw-r--r-- 34132 crm.designer.js
-rw-r--r-- 7966 crm.profile-selector.js