Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16
authorkurund <kurund@civicrm.org>
Wed, 31 Jul 2013 11:19:54 +0000 (16:49 +0530)
committerkurund <kurund@civicrm.org>
Wed, 31 Jul 2013 11:19:54 +0000 (16:49 +0530)
commitcdeb4bdffdfc26d382057594206ed1f39721f6f6
tree4ea14061868aa2d790b644092e79239e62b09c39
parenta6b4a926590b888f8b0610b94f43a6e7c9781377
parentffd86f787b1c7d491dd091eb6b8a294c8f7a016b
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

Conflicts:
CRM/Contact/Form/Task/Batch.php
CRM/Contribute/Form/Task/Batch.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Price/BAO/LineItem.php
CRM/Utils/System/Base.php
templates/CRM/Batch/Form/Entry.tpl
18 files changed:
CRM/Batch/Form/Entry.php
CRM/Contact/Form/Task/Batch.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/ContributionPage/Amount.php
CRM/Contribute/Form/Task/Batch.php
CRM/Core/Payment/BaseIPN.php
CRM/Event/BAO/Event.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Mailing/Event/BAO/Reply.php
CRM/Price/BAO/LineItem.php
CRM/Price/BAO/PriceFieldValue.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Utils/File.php
CRM/Utils/System/Base.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php
api/v3/Mailing.php
templates/CRM/Batch/Form/Entry.tpl