Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-14-22-39-05
authorKurund Jalmi <kurund@civicrm.org>
Sun, 14 Jul 2013 17:40:20 +0000 (23:10 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Sun, 14 Jul 2013 17:40:20 +0000 (23:10 +0530)
commitc8950569c8c39745086e5a6c9df08b36441b5662
treec00a53f81b6e3d15173f7d58c86a1503c8208bbb
parenta5b9bda4722164aa417ccfb4bd062e74b107eaf4
parent29fbe4324814bfc1a3e1d27fb6b271099f674df9
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-14-22-39-05

Conflicts:
CRM/Contact/BAO/Contact.php
CRM/Group/Page/AJAX.php
CRM/Report/Form/Member/Detail.php
CRM/Utils/SoapServer.php
CRM/Utils/System/Base.php
sql/civicrm_generated.mysql
tests/phpunit/CRM/Core/DAOTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ContributionTest.php
xml/version.xml
62 files changed:
CRM/Admin/Form/Setting/Component.php
CRM/Case/XMLProcessor/Process.php
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/Query.php
CRM/Contact/Selector.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/Form/ContributionPage/AddProduct.php
CRM/Contribute/Form/ManagePremiums.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/DAO.php
CRM/Core/Payment/PayPalIPN.php
CRM/Core/Payment/PayPalProIPN.php
CRM/Custom/Form/Group.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Event/Form/Registration/Register.php
CRM/Financial/BAO/FinancialItem.php
CRM/Financial/BAO/FinancialTypeAccount.php
CRM/Group/Page/AJAX.php
CRM/Logging/Differ.php
CRM/Member/Form/MembershipType.php
CRM/Pledge/Form/Search.php
CRM/Report/Form.php
CRM/Report/Form/Member/Detail.php
CRM/Upgrade/Form.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl
CRM/Utils/Address/BatchUpdate.php
CRM/Utils/String.php
CRM/Utils/System.php
CRM/Utils/System/Base.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php
CRM/Utils/System/Joomla.php
CRM/Utils/Token.php
api/api.php
api/v3/Contact.php
api/v3/Contribution.php
api/v3/MembershipType.php
install/template.html
settings/Core.setting.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
templates/CRM/Event/Page/EventInfo.tpl
tests/phpunit/CRM/Contact/BAO/GroupContactCacheTest.php
tests/phpunit/CRM/Core/DAOTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/WebTest/Contribute/OfflineContributionTest.php
tests/phpunit/api/v3/APITest.php
tests/phpunit/api/v3/ContributionTest.php
tests/phpunit/api/v3/MembershipTypeTest.php
tests/phpunit/api/v3/ParticipantTest.php
xml/templates/message_templates/event_offline_receipt_html.tpl
xml/templates/message_templates/event_offline_receipt_text.tpl
xml/templates/message_templates/event_online_receipt_html.tpl
xml/templates/message_templates/event_online_receipt_text.tpl