----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623

fix for CRM-11310 : applied patch

CRM-12172

----------------------------------------
* CRM-12172: Use preg_replace_callback() in CRM_Utils_Token
  http://issues.civicrm.org/jira/browse/CRM-12172

CRM-9855

----------------------------------------
* CRM-9855: CiviMail sets X-header "X-CiviMail-Bounce" on outbound bulk email, but does not use it to identify an inbound bounce
  http://issues.civicrm.org/jira/browse/CRM-9855

Whitespacelimited

CRM-10397 Pay Later Improvements

Update title and description of Contributions by Organization

CRM-12613 - Forward port REST.php

This file had been held back from normal merge-forward due to
merge-conflicts.  Investigating upstream/master, it seems that there were
two changes that may have been source of conflict:

 * 2ede60ec - This is formatting change and a bad-commit of a debug code
 * c5f77b41 - This is a real functional change but was backported (and
   further fixed) in 4.3, so 4.3's version is better.

----------------------------------------
* CRM-12613: Resolve merge of REST.php (4.3=>master)
  http://issues.civicrm.org/jira/browse/CRM-12613

CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add...

Test fixes (contribution soft credit, tweaks on previous fixes)