Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23
authorkurund <kurund@civicrm.org>
Wed, 13 May 2015 10:31:56 +0000 (16:01 +0530)
committerkurund <kurund@civicrm.org>
Wed, 13 May 2015 10:31:56 +0000 (16:01 +0530)
commita14e123a77a33879f3dd63c74b0c72031e0c8b5f
treea7edc21eb1149440ef12f85e6efea3595624e579
parentd13aad2b8055ccff25895e06a6bcc8d1a039f114
parentc53d2f7ed7d3a69df77430aa22e25f32c7cf9542
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23

Conflicts:
sql/civicrm_generated.mysql
tests/phpunit/api/v3/SyntaxConformanceTest.php
21 files changed:
CRM/Case/BAO/CaseType.php
CRM/Contact/BAO/GroupContactCache.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/ContributionPage/Amount.php
CRM/Core/BAO/Mapping.php
CRM/Event/Form/Registration/Confirm.php
CRM/Member/BAO/Membership.php
CRM/Member/Form/MembershipBlock.php
CRM/Price/BAO/PriceSet.php
CRM/Report/Form/Contribute/Summary.php
ang/crmUi.js
api/v3/utils.php
tests/phpunit/CRM/Case/BAO/CaseTypeTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/WebTest/Contact/AdvancedSearchTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
xml/templates/civicrm_data.tpl
xml/templates/civicrm_state_province.tpl