Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28
authorkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 17:26:16 +0000 (22:56 +0530)
committerkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 17:26:16 +0000 (22:56 +0530)
commit35598dc5bbdd980bc0d93e7348d844f519acd504
tree02cceaab0425dc077dfcdf7f62c6133a194e6f4d
parent656c954bcaf3b7c9f1dbb43d529c328a4b1665f3
parent1043c809d7f51e9b15f8c0978c4ab776ec6be708
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28

Conflicts:
CRM/Report/Form/Contribute/TopDonor.php
sql/civicrm_generated.mysql
templates/CRM/Price/Form/Calculate.tpl
xml/version.xml
34 files changed:
CRM/Activity/BAO/Activity.php
CRM/Batch/BAO/Batch.php
CRM/Case/BAO/Case.php
CRM/Contact/BAO/Group.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Search/Custom/ActivitySearch.php
CRM/Contact/Form/Search/Custom/Base.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EmployerListing.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/Group.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Contact/Page/AJAX.php
CRM/Core/BAO/FinancialTrxn.php
CRM/Core/BAO/PrevNextCache.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/Recipients.php
CRM/Mailing/Event/BAO/Bounce.php
CRM/Mailing/Event/BAO/Delivered.php
CRM/Mailing/Event/BAO/Forward.php
CRM/Mailing/Event/BAO/Opened.php
CRM/Mailing/Event/BAO/Queue.php
CRM/Mailing/Event/BAO/Reply.php
CRM/Mailing/Event/BAO/TrackableURLOpen.php
CRM/Mailing/Event/BAO/Unsubscribe.php
CRM/Report/Form.php
CRM/Report/Form/Contribute/TopDonor.php
CRM/Upgrade/Incremental/Legacy.php
CRM/Upgrade/Incremental/php/FourThree.php
CRM/Utils/System/Drupal6.php
sql/civicrm_generated.mysql
templates/CRM/Admin/Form/Setting/Smtp.tpl
templates/CRM/Price/Form/Calculate.tpl
tools/scripts/mk-drupal-test-site