Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51
authorkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 09:23:16 +0000 (14:53 +0530)
committerkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 09:23:16 +0000 (14:53 +0530)
commitab2e3179d57fbd8b60c0730ec38b6cb678100a28
tree4bb5063346541d891ede2b16a0187c769ec23474
parentbf075759a4db3ebcf3e52b227d5e572788491548
parentb16f5f7b7a553d3c1a75bc291cc0e944eef4253d
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51

Conflicts:
CRM/Core/BAO/ActionSchedule.php
templates/CRM/Core/BillingBlock.tpl
CRM/Activity/BAO/Activity.php
CRM/Admin/Form/ScheduleReminders.php
CRM/Contact/Form/Task/Label.php
CRM/Core/BAO/ActionSchedule.php
CRM/Core/Page/AJAX/Location.php
CRM/Dedupe/Merger.php
CRM/Mailing/Event/BAO/Unsubscribe.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
templates/CRM/Core/BillingBlock.tpl
templates/CRM/common/l10n.js.tpl
tests/phpunit/WebTest/Contact/MergeContactsTest.php