From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 14 Jan 2014 02:51:42 +0000 (-0800)
Subject: Merge pull request #2333 from davecivicrm/CRM-10043
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=40c85a44256cba47ef8892b28a875033c471d41f;p=civicrm-core.git

Merge pull request #2333 from davecivicrm/CRM-10043

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

40c85a44256cba47ef8892b28a875033c471d41f