Conflicts:
	CRM/Contribute/BAO/Contribution.php
	tests/phpunit/api/v3/GroupContactTest.php

CRM-14147: Fix 4.1 to 4.2 upgrade in non-english (ex: french, where the profileTitle may have an apostrophe in it.

CRM-14047 - for this participant should only be appended when additional...

CRM-14047 - for this participant should only be appended when additionalParticipants flag is true - otherwise it is confusing.

----------------------------------------
* CRM-14047: Online event registration: add text to clarify the meaning of the Total Fee(s) calculated value
  http://issues.civicrm.org/jira/browse/CRM-14047

CRM-14155 Participant Reports - add event custom fields as fields & filt...

 CRM-14126 - Wrap CURLOPT_FOLLOWLOCATION in a check for open_basedir and safe_mode

CRM-14126 - CRM_Extension - Add pleasant warning and log message if open_basedir/safe_mode prevents redirects.

----------------------------------------
 * CRM-14126: HttpClient.php library used by CiviCRM issues a PHP warning when open_basedir is set
   http://issues.civicrm.org/jira/browse/CRM-14126

Test fix

CRM-14151 add hacky-handling to receive date like other date fields in c...

CRM-14154. Add API method for "message_template", "send".

Contact ref

Crm 13968

CRM-13833 - Add contact summary link to soft credit contacts in Soft Cre...

----------------------------------------
* CRM-13833: Implement Soft Credit Types
  http://issues.civicrm.org/jira/browse/CRM-13833

for to_financial_account_id and status_id

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
  http://issues.civicrm.org/jira/browse/CRM-13968

Fix membership join date from being overwritten by api

CRM-14151 add hacky-handling to receive date like other date fields in completetransaction function to mitigate DAO->find() followed by DAO->save() fatalling on date fields .. sometimes

----------------------------------------
* CRM-14151: BaseIPN fails when receipt_date is set
  http://issues.civicrm.org/jira/browse/CRM-14151

CRM-14149 - fix bad markup in Job.tpl

----------------------------------------
* CRM-14149: Bad tags on Add Scheduled Job page break page layout
  http://issues.civicrm.org/jira/browse/CRM-14149

CRM-14146 - conditionally change contribution button text  based on whet...

CRM-14146 - conditionally change contribution button text  based on whether confirm page is skipped.

----------------------------------------
* CRM-14146: Button on contribution page should be "Confirm Contribution"
  http://issues.civicrm.org/jira/browse/CRM-14146

Crm 13965