Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22
authorKurund Jalmi <kurund@yahoo.com>
Tue, 15 Sep 2015 06:22:41 +0000 (11:52 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Tue, 15 Sep 2015 06:22:41 +0000 (11:52 +0530)
commit638c59ed3d7f7fda62fa581d271c475c473043ce
tree97fd82ea7dfc56bdec0ac4979bcb48282d95f1af
parent3edc5f825825b0c4b539d22e3658807ea6074b53
parentd937a65d7d33ea610e308f45298bbb7b013102a2
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22

Conflicts:
CRM/Admin/Form/Setting/Localization.php
CRM/Event/BAO/Query.php
CRM/Export/BAO/Export.php
CRM/Financial/Page/AJAX.php
templates/CRM/Event/Form/Registration/Register.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
22 files changed:
CRM/Campaign/BAO/Petition.php
CRM/Contribute/BAO/Contribution.php
CRM/Core/I18n.php
CRM/Core/Payment/ProcessorForm.php
CRM/Event/Form/Registration/Confirm.php
CRM/Financial/Page/AJAX.php
CRM/Report/Form.php
CRM/Report/Form/Contribute/Detail.php
CRM/Report/Form/Contribute/Repeat.php
CRM/Report/Form/Contribute/SoftCredit.php
CRM/Report/Form/Contribute/Summary.php
CRM/Report/Form/Event/ParticipantListing.php
CRM/Report/Form/Member/Detail.php
CRM/Utils/Mail/EmailProcessor.php
api/v3/MembershipType.php
templates/CRM/Core/BillingBlock.tpl
templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
templates/CRM/Event/Form/Registration/DisplayProfile.tpl
templates/CRM/Event/Form/Registration/Register.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
tests/phpunit/api/v3/ContactTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php