Merge branch '4.6' of https://github.com/civicrm/civicrm-core
authorEileen McNaughton <eileen@fuzion.co.nz>
Fri, 10 Jul 2015 04:59:42 +0000 (16:59 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Fri, 10 Jul 2015 04:59:42 +0000 (16:59 +1200)
commit8bef2e38f2acd7e60b2ca397f91ea0da373f6db6
tree029c8bfe9897fa97d908fb113d662c06c868b04d
parentda77cbbd762c281842e455f7876ea70ea72b1fc2
parent9a08eeb82feb142945af3fdff050aea4d19d23b9
Merge branch '4.6' of https://github.com/civicrm/civicrm-core

Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Member/BAO/Membership.php
CRM/Member/Form.php
CRM/Member/Form/MembershipRenewal.php
tests/phpunit/api/v3/ContributionPageTest.php
12 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/UFGroup.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Member/BAO/Membership.php
CRM/Member/Form.php
CRM/Member/Form/Membership.php
CRM/Member/Form/MembershipRenewal.php
js/model/crm.uf.js
tests/phpunit/WebTest/Event/PCPAddTest.php
tests/phpunit/api/v3/ContributionPageTest.php