Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49
[civicrm-core.git] / tools / extensions / org.civicrm.search.activity /
drwxr-xr-x   ..
-rw-r--r-- 12870 ActivitySearch.php
-rw-r--r-- 1029 info.xml
drwxr-xr-x - templates