Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23
authorKurund Jalmi <kurund@civicrm.org>
Wed, 5 Jun 2013 06:10:24 +0000 (11:40 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 5 Jun 2013 06:10:24 +0000 (11:40 +0530)
commitf8c36033b83eb127a5443595b7aea3c6e68cd855
tree67a192f29ba20835c955f6c0972aa71f509b71bf
parent24ea8a2b8ec6e25aeb43d2b52615056181a91a1f
parent39975bea252a8d47317c9de24dcc9dd9d8b7b45f
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23

Conflicts:
CRM/Case/Form/Activity.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/PriceSet.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Core/BAO/ConfigSetting.php
CRM/Financial/BAO/FinancialType.php
CRM/Report/Form.php
CRM/Report/Form/Campaign/SurveyDetails.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
58 files changed:
CRM/Admin/Form/Job.php
CRM/Contact/BAO/Contact.php
CRM/Contact/Form/Search/Custom/ActivitySearch.php
CRM/Contact/Form/Search/Custom/Basic.php
CRM/Contact/Form/Search/Custom/MultipleValues.php
CRM/Contact/Form/Search/Custom/Proximity.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/ContributionCharts.php
CRM/Core/BAO/ConfigSetting.php
CRM/Core/BAO/FinancialTrxn.php
CRM/Core/Payment/BaseIPN.php
CRM/Event/Form/EventFees.php
CRM/Event/Form/Participant.php
CRM/Event/Form/Registration.php
CRM/Event/Page/ParticipantListing/Simple.php
CRM/Export/BAO/Export.php
CRM/Logging/Reverter.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/Page/AJAX.php
CRM/Member/Form/Membership.php
CRM/PCP/BAO/PCP.php
CRM/Report/Form/Activity.php
CRM/Report/Form/ActivitySummary.php
CRM/Report/Form/Case/Detail.php
CRM/Report/Form/Contribute/Lybunt.php
CRM/Report/Form/Contribute/Summary.php
CRM/Report/Form/Contribute/Sybunt.php
CRM/Report/Form/Event/Summary.php
CRM/Report/Form/Walklist/Walklist.php
CRM/Utils/File.php
CRM/Utils/OpenFlashChart.php
CRM/Utils/System.php
api/v3/Contact.php
api/v3/utils.php
sql/civicrm_generated.mysql
templates/CRM/Campaign/Page/Petition/SocialNetwork.tpl
templates/CRM/Contribute/Form/ContributionPage/PCP.hlp
templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
templates/CRM/Core/BillingBlock.tpl
templates/CRM/Event/Page/EventInfo.tpl
templates/CRM/Profile/Form/Dynamic.tpl
templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
templates/CRM/common/civicrm.settings.php.tpl
tests/phpunit/api/v3/ACLPermissionTest.php
tests/phpunit/api/v3/AddressTest.php
tests/phpunit/api/v3/CampaignTest.php
tests/phpunit/api/v3/EventTest.php
tests/phpunit/api/v3/MailSettingsTest.php
tests/phpunit/api/v3/MailingGroupTest.php
tests/phpunit/api/v3/ParticipantStatusTypeTest.php
tests/phpunit/api/v3/PledgePaymentTest.php
tools/extensions/org.civicrm.report.grant/Grant.php
tools/extensions/org.civicrm.search.basic/Basic.php
xml/templates/civicrm_sample.tpl