Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-19-00-06-22
authorkurund <kurund@civicrm.org>
Mon, 18 Aug 2014 18:42:45 +0000 (00:12 +0530)
committerkurund <kurund@civicrm.org>
Mon, 18 Aug 2014 18:42:45 +0000 (00:12 +0530)
commit51daafaadd025703b2f8d6e3d27898e3768908f9
tree3ab62f12823b80c069846c6811f771cd8cfea466
parent507a797ddb6d71c1983a597fefc1abde21ba927b
parentcab5f44fa535be1026cdd0aa23ada0344da5a27b
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-19-00-06-22

Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Report/BAO/ReportInstance.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Report/BAO/ReportInstance.php
tests/phpunit/api/v3/ContributionTest.php