Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-09-25-01-46-57
authorkurund <kurund@civicrm.org>
Wed, 25 Sep 2013 00:01:34 +0000 (02:01 +0200)
committerkurund <kurund@civicrm.org>
Wed, 25 Sep 2013 00:01:34 +0000 (02:01 +0200)
commit03a8c3dcf5d8c3fe76a0551cbdfea259fc40e101
treedd54de012c326d83d7765a9e0f81c206dd6d61a1
parent45c269b128b4d41bd38de18f346ceefee2555be2
parent2eaac6760784769629c4dcb20dddd7c6ace33f45
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-09-25-01-46-57

Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution.php
CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
tests/phpunit/WebTest/Contribute/OnlineContributionTest.php
tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php
17 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/AdditionalInfo.php
CRM/Contribute/Form/Contribution.php
CRM/Contribute/Form/ContributionPage/Amount.php
CRM/Contribute/Form/ContributionPage/Settings.php
CRM/Contribute/Form/ManagePremiums.php
CRM/Core/BAO/SchemaHandler.php
CRM/Core/Block.php
CRM/Event/Form/Participant.php
CRM/Financial/BAO/FinancialTypeAccount.php
CRM/Logging/Schema.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
tests/phpunit/WebTest/Contribute/OnlineContributionTest.php
tests/phpunit/WebTest/Member/OfflineMembershipAddPricesetTest.php
tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php