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)
commit124bc594cfa2e12671f61865d2938639329b4eda
tree532a7328b44f191b82eaabd2f26a99d9ac629cd0
parent1a88a3a576869e2c40f68d17579c306f1155a6d2
parent58fbba77e5c34171be5466fb8afca79c7e0f9631
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-27-05-47-07
CRM/Activity/Selector/Search.php
templates/CRM/Contact/Page/View/Summary.tpl