----------------------------------------
* CRM-12845: CRM_Utils_Migrate - Handle CustomGroup subtypes
  http://issues.civicrm.org/jira/browse/CRM-12845

----------------------------------------
* CRM-12845: CRM_Utils_Migrate - Handle CustomGroup subtypes
  http://issues.civicrm.org/jira/browse/CRM-12845

CRM-12910, extend log reports to support injected job tables, via report...

CRM-13165 - Facilitate validation fixes in CiviHR

----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
  http://issues.civicrm.org/jira/browse/CRM-13165

----------------------------------------
* CRM-13165: hrjob: Re-save produces blocking error, "X is not a valid amount"
  http://issues.civicrm.org/jira/browse/CRM-13165

Fix sort order for currency multi-select

Fix currency symbols CRM-13144
Will do a further commit since orderColumn param needs to be TRUE so that currency multi-select is sorted alphabetically.

fixed the regression caused due to rename of FieldValue to PriceFieldVal...

test fixes

CRM-13064

----------------------------------------
* CRM-13064: Localization is broken
  http://issues.civicrm.org/jira/browse/CRM-13064

Conflicts:
	sql/civicrm_generated.mysql
	xml/schema/Financial/OfficialReceipt.xml
	xml/schema/Financial/files.xml

CRM-13017

----------------------------------------
* CRM-13144: Currency display is messed up
  http://issues.civicrm.org/jira/browse/CRM-13144

CRM_Utils_Hook_UnitTests - When running tests from an extension...

----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
  http://issues.civicrm.org/jira/browse/CRM-13089

----------------------------------------
* CRM-13089: CRM_Core_BAO_CustomField::create overrides user-defined name parameter values
  http://issues.civicrm.org/jira/browse/CRM-13089

Merge branch 'crm-13089-CRM_Core_BAO_CustomField_overrides_name' of git://github.com/mmikitka/civicrm-core into pull-request-1206

Abstract payment js to work in webform context

 	CRM-12869 This is a temporary fix from Eileen which prevents the over-writing of email address

fix notice for failing test(CRM-10138)

3 months of events & don't default to sending receipt for past events (CRM-13189)
Thx Andrew. I think the last change you made is quite helpful and works nicely.

CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid C

CRM-13143 contact reference field issue fix : the referencing for customIdObj was incorrect i.e. it was refering to corrupt element object, thus 'id' value was not getting stored in the correct element object so the formRule error was thrown of 'Invalid Contact ...' as the submission required numeric id

CRM-12930 Always use Smarty security for string templates

CRM-10935 - CRM/Core/xml/Menu/Contact.xml - Fix malformed permissions

----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact"  and "CiviCRM: Edit own Contact"
  http://issues.civicrm.org/jira/browse/CRM-10935

CRM-12869 This is a temporary fix from Eileen which prevents the over-write. However it also prevents the billing address from being saved for the payee, and requires the user to know that they need to manually replace the billing field values with the payer data. In general I do not think this record payment from a differnet contact feature  is production-ready (even though it is part of 4.3). Selecting a different payer should reload the the billing address fields with the payer info.

----------------------------------------
* CRM-12869: Record Payment from different contact causes email and address to be altered in contacts record
  http://issues.civicrm.org/jira/browse/CRM-12869

CRM-12930, reverting commits associated with this issue

This reverts commit 30ffbdf0, reversing
changes made to 94ee5a7f.