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)
CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...


Trivial merge