Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Fri, 19 Jun 2015 19:25:55 +0000 (15:25 -0400)
committerColeman Watts <coleman@civicrm.org>
Fri, 19 Jun 2015 19:25:55 +0000 (15:25 -0400)
commitce1e9d7538566c91aecd24ed15def59c133c0a07
tree46ce6a15dcf04f5139e80109f53f0efca6dc7a06
parentab57c17c92d2dbbab0bcdddbb5ef66a36962b4ff
parent65e3e1ce2d1e407fa768966606173c79b12ba81f
Merge branch '4.6' into master

Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/Mapping.php
CRM/Core/BAO/PdfFormat.php
CRM/Core/Payment/Form.php
CRM/Member/BAO/Membership.php
CRM/Utils/Hook.php
sql/civicrm_generated.mysql
xml/version.xml
35 files changed:
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Form/Relationship.php
CRM/Contact/Page/AJAX.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/AbstractEditPayment.php
CRM/Contribute/Form/AdditionalPayment.php
CRM/Contribute/Form/ContributionPage/Amount.php
CRM/Contribute/Form/SoftCredit.php
CRM/Contribute/Form/Task/Invoice.php
CRM/Contribute/Form/UpdateBilling.php
CRM/Contribute/Form/UpdateSubscription.php
CRM/Core/BAO/Address.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/Navigation.php
CRM/Core/Payment/Form.php
CRM/Core/Payment/ProcessorForm.php
CRM/Event/BAO/Event.php
CRM/Event/Cart/Form/Checkout/Payment.php
CRM/Event/Form/EventFees.php
CRM/Mailing/BAO/Mailing.php
CRM/Member/Form.php
CRM/Report/Form/Activity.php
CRM/Utils/Cache.php
CRM/Utils/Hook.php
CRM/Utils/REST.php
js/crm.ajax.js
templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
templates/CRM/Contribute/Form/AdditionalPayment.tpl
templates/CRM/Contribute/Form/Contribution.tpl
templates/CRM/Core/BillingBlock.tpl
templates/CRM/Member/Form/Membership.tpl
tests/phpunit/api/v3/ContributionPageTest.php