-- fixed for CRM-10146, Restricted the creation of same membership and activity again.
Correct params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().
CRM-12623, count_distinct stat

----------------------------------------
* CRM-12623: Create CiviHR Report Template
  http://issues.civicrm.org/jira/browse/CRM-12623
BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site with no (visible, well-defined, single-value) CustomGroups.
CRM-12864
Merge pull request #1037 from deepak-srivastava/logs

CRM-12867
Merge pull request #1034 from totten/master-no-customgroups-warning

BAO_CustomGroup - Fix warning when displaying "Edit Contact" on a site w...
Merge pull request #1036 from yashodha/fixes

CRM-12864
CRM-12623, support setting accordion title with groupings

----------------------------------------
* CRM-12623:
  http://issues.civicrm.org/jira/browse/CRM-12623
Merge pull request #1044 from deepak-srivastava/CRM-12623

CRM-12623
Merge pull request #1005 from GiantRobot/CRM-12804

Correct params to CRM_Upgrade_Form::doIncrementalUpgradeFinish().
Merge pull request #995 from dpradeep/CRM-10146-commit

-- fixed for CRM-10146, Restricted the creation of same membership and a...

Recreated bug, applied patch and tested ok. Also reviewed and ran the new web test.
CRM-12880 and CRM-11784 help text improvements.

----------------------------------------
* CRM-12880: ACL help text could be slightly clearer?
  http://issues.civicrm.org/jira/browse/CRM-12880
* CRM-11784: user text for civicrm/event/manage
  http://issues.civicrm.org/jira/browse/CRM-11784
CRM-12619  fix relationship search start end dates to be separate & don't require type
CRM-12619 - per comment remove obsolete variables
tidy up on survey test to make it a good template
print debug on failure
don't treat 'debug=0' as set
api test e-notice compliance provide appropriate default for 'date_format' where appropriate
Make relationship api test ENotice Compliant