Merge pull request #2333 from davecivicrm/CRM-10043
authorDave Greenberg <dave@civicrm.org>
Tue, 14 Jan 2014 02:51:42 +0000 (18:51 -0800)
committerDave Greenberg <dave@civicrm.org>
Tue, 14 Jan 2014 02:51:42 +0000 (18:51 -0800)
commit40c85a44256cba47ef8892b28a875033c471d41f
treeb8d05aa0aebbd266dc4f52c2d63ec18cfa6a05c0
parente2c0856b24630f71827582e867228d09db210d02
parent3521f4ab653e2c750a90af387fd2435d3d7e8a2f
Merge pull request #2333 from davecivicrm/CRM-10043

CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...