Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-27-10-02-15
authorKurund Jalmi <kurund@yahoo.com>
Mon, 27 Jul 2015 06:45:26 +0000 (12:15 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 27 Jul 2015 06:45:26 +0000 (12:15 +0530)
commit86d6da5b052426f6cae65e67e772aba37aff5c6e
tree63897b7a90660e851100cf89141ea6ca950d1e9e
parentf56219002b27cd1c3ff97c2e514e4135d4e55899
parente90454b94cf5f8dc8ff075e9d434d108767d67f5
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-27-10-02-15

Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Core/Payment.php
CRM/Core/Payment/IATS.php
CRM/Core/Payment/PayPalImpl.php
17 files changed:
CRM/Contact/BAO/Relationship.php
CRM/Contribute/Form/ContributionPage.php
CRM/Contribute/Form/ContributionPage/Custom.php
CRM/Core/Form.php
CRM/Core/Payment.php
CRM/Core/Payment/AuthorizeNet.php
CRM/Core/Payment/PayPalImpl.php
CRM/Event/Form/ManageEvent.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Financial/BAO/PaymentProcessor.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
CRM/Profile/Page/MultipleRecordFieldsListing.php
js/crm.ajax.js
templates/CRM/Case/Form/Activity.tpl
templates/CRM/Contact/Page/View/Summary.js
templates/CRM/Contribute/Form/Contribution.tpl