Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-27-05-47-07
authorTim Otten <totten@civicrm.org>
Wed, 27 Nov 2013 13:47:11 +0000 (05:47 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 27 Nov 2013 13:47:11 +0000 (05:47 -0800)
1  2 
CRM/Activity/Selector/Search.php
templates/CRM/Contact/Page/View/Summary.tpl

Simple merge