Merge branch '4.4' of https://github.com/civicrm/civicrm-core
authorColeman Watts <coleman@civicrm.org>
Sat, 4 Jan 2014 00:05:34 +0000 (16:05 -0800)
committerColeman Watts <coleman@civicrm.org>
Sat, 4 Jan 2014 00:05:34 +0000 (16:05 -0800)
commitb5e8537ad99104f37a433de51d5d2abcebb5977c
treedd0622de08b2fa4ac3b53b50d39e321f0ff825df
parent3ca50f32650eb7a063fa728284cd9a40619f9b6f
parent2954ccbf995c2aea19d0ab294cb1a890233dd9be
Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
CRM/Core/BAO/Navigation.php
xml/schema/Mailing/Event/Bounce.xml
26 files changed:
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Group.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/Navigation.php
CRM/Core/DAO.php
CRM/Event/BAO/Event.php
CRM/Export/BAO/Export.php
CRM/Mailing/BAO/Mailing.php
templates/CRM/Contact/Page/View/Summary.tpl
templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
tests/phpunit/api/v3/CaseTest.php
tests/phpunit/api/v3/ContributionSoftTest.php
xml/schema/Activity/Activity.xml
xml/schema/Campaign/CampaignGroup.xml
xml/schema/Campaign/Survey.xml
xml/schema/Contribute/Contribution.xml
xml/schema/Contribute/ContributionPage.xml
xml/schema/Contribute/ContributionRecur.xml
xml/schema/Event/Event.xml
xml/schema/Event/Participant.xml
xml/schema/Mailing/Event/Bounce.xml
xml/schema/Mailing/Mailing.xml
xml/schema/Member/Membership.xml
xml/schema/Pledge/Pledge.xml