Merge branch 4.6 into master
authorColeman Watts <coleman@civicrm.org>
Mon, 30 Mar 2015 00:03:07 +0000 (20:03 -0400)
committerColeman Watts <coleman@civicrm.org>
Mon, 30 Mar 2015 00:03:07 +0000 (20:03 -0400)
commitc15fb38374462a40d704d83fac983412df8a16a1
tree4d6996f0417f192a08a599280f2a074cd93881e5
parentab483d71b848d8a29d17a49380403f15bc319baf
parent82fd7aef5afb57464121d60e237c626cf5752333
Merge branch 4.6 into master

Conflicts:
CRM/Utils/Api.php
28 files changed:
CRM/Activity/Form/Activity.php
CRM/Admin/Form/ParticipantStatusType.php
CRM/Admin/Form/Tag.php
CRM/Campaign/Form/Campaign.php
CRM/Campaign/Form/Survey/Main.php
CRM/Contact/Form/Contact.php
CRM/Contact/Form/Edit/Individual.php
CRM/Contact/Form/Edit/Lock.php
CRM/Contact/Form/Inline.php
CRM/Contact/Form/Search.php
CRM/Contribute/Form/ContributionPage.php
CRM/Core/BAO/Domain.php
CRM/Core/BAO/Mapping.php
CRM/Core/Form.php
CRM/Event/Form/ManageEvent.php
CRM/Event/Form/Participant.php
CRM/Event/Form/SearchEvent.php
CRM/Grant/Form/Grant.php
CRM/Member/Form/MembershipConfig.php
CRM/Profile/Form.php
Civi/API/Subscriber/ChainSubscriber.php
api/v3/Generic.php
api/v3/utils.php
templates/CRM/Admin/Page/APIExplorer.js
templates/CRM/Contact/Form/Contact.hlp
templates/CRM/Event/Form/Selector.tpl
templates/CRM/Financial/Form/FinancialAccount.tpl
tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php