Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14
[civicrm-core.git] / tools / extensions / org.civicrm.search.activity /
drwxr-xr-x   ..
-rw-r--r-- 12882 ActivitySearch.php
-rw-r--r-- 1029 info.xml
drwxr-xr-x - templates