Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-02-21-30-06
authorkurund <kurund@civicrm.org>
Mon, 2 Mar 2015 16:11:34 +0000 (21:41 +0530)
committerkurund <kurund@civicrm.org>
Mon, 2 Mar 2015 16:11:34 +0000 (21:41 +0530)
commite98a98049142cec1b405f66dab5ced1be07336ec
treec0c2e28385c7bf54a834ab53ecb7ca4ecb6b757e
parentdab6d648a8fa40b4568b160c0bfaa69600bc196d
parentc3880b0aee27b293b8fe4cd2bedbc2b19a1dbe49
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-02-21-30-06

Conflicts:
CRM/Contact/Form/Search.php
CRM/Contact/Form/Search/Custom.php
CRM/Contact/Form/Search/Custom/ActivitySearch.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EmployerListing.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Contact/Form/Search/Interface.php
14 files changed:
CRM/Contact/Form/Search.php
CRM/Contact/Form/Search/Custom.php
CRM/Contact/Form/Search/Custom/ActivitySearch.php
CRM/Contact/Form/Search/Custom/Base.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/FullText.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Contact/Form/Search/Interface.php
CRM/Core/Form/Search.php
CRM/Report/Form/Grant/Detail.php
CRM/Utils/Check/Security.php
tests/phpunit/CiviTest/CiviUnitTestCase.php