Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
authorKurund Jalmi <kurund@yahoo.com>
Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)
commitd50cdfb50e1cbcbfd9d61e6a7bb76104a9099350
tree22ba49c92384c565aa8ac54d89aac1f4806a7979
parent812d774cf3880a9e8d051ead3074b93eef0f2946
parentacf6be750174f788909dd88d76828f4703650789
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41

Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php
CRM/Report/Form.php
CRM/Report/Form/Contribute/Summary.php
CRM/Report/Form/Event/ParticipantListCount.php
templates/CRM/Price/Form/PriceSet.tpl
tests/phpunit/api/v3/ContributionTest.php