Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39
authorkurund <kurund@civicrm.org>
Mon, 29 Jun 2015 17:55:19 +0000 (23:25 +0530)
committerkurund <kurund@civicrm.org>
Mon, 29 Jun 2015 17:55:19 +0000 (23:25 +0530)
commit0bc483648ce59a68bb752827b218f6976689660e
treef64c2bd3cd6bffe8dcf9103ff5e067f0b32f5fd9
parent9d3be1ed8ea1e282801bb830790de72d836a4250
parent8320366f8cdcc5a776183bb8e38ef48b50f92575
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39

Conflicts:
CRM/Contribute/Form/Search.php
CRM/Core/Lock.php
17 files changed:
CRM/Contact/BAO/GroupContactCache.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/Search.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/MailingJob.php
CRM/Utils/System.php
bin/ContributionProcessor.php
bin/deprecated/EmailProcessor.php
js/Common.js
templates/CRM/Contribute/Form/Search/Common.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/WebTest/Campaign/ActivityTest.php
tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
tests/phpunit/WebTest/Event/AddParticipationTest.php
tests/phpunit/WebTest/Event/AddPricesetTest.php
tests/phpunit/WebTest/Report/LoggingReportTest.php
tests/phpunit/api/v3/ContributionTest.php