Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25
authorkurund <kurund@civicrm.org>
Mon, 3 Feb 2014 22:55:07 +0000 (14:55 -0800)
committerkurund <kurund@civicrm.org>
Mon, 3 Feb 2014 22:55:07 +0000 (14:55 -0800)
commit73be989745ea968ffa538d5679bce4303bbf5306
treeada793c8f09267da5055dd3cda7c531a88c421cf
parent2defed0f7c1b085f17b3e5f74fcee46c1f5c0120
parentfa6ae54bb5b5b86f810b89f2b05ea90afeb1d230
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25

Conflicts:
CRM/Contribute/BAO/Contribution.php
tests/phpunit/api/v3/GroupContactTest.php
15 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Core/Payment/BaseIPN.php
CRM/Core/Permission.php
CRM/Financial/BAO/FinancialItem.php
CRM/Member/BAO/Membership.php
CRM/Member/BAO/MembershipType.php
CRM/Report/Form/Event/ParticipantListCount.php
CRM/Report/Form/Event/ParticipantListing.php
CRM/Upgrade/Incremental/php/FourTwo.php
templates/CRM/Group/Form/Search.tpl
templates/CRM/Price/Form/Calculate.tpl
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/GroupContactTest.php