CRM-12686 add ability to set specific date as a default
CRM-12687 make DAO field optional when defining report columns
CRM-12688
CRM-12688
Merge pull request #854 from yashodha/CRM-12688

CRM-12688
Yash - the help needs to be clearer, since I "think" you said the behavior is that reminders are limited to participants who have the selected status(es) AND meet the Limit Recipients criteria. Maybe something like "Only send reminders to participants with the status(es) selected above AND who match this criteria. If you select Manual Recipients - only those people will receive the reminder (AND only if they are ALSO participants with the selected status)."
CRM-12594

----------------------------------------
* CRM-12594: Wrong texts in UI
  http://issues.civicrm.org/jira/browse/CRM-12594
CRM-12594

----------------------------------------
* CRM-12594: Wrong texts in UI
  http://issues.civicrm.org/jira/browse/CRM-12594
Merge pull request #856 from dlobo/CRM-12594

CRM-12594 - Fix typo in warning message
Automatically filter test records on forced searches CRM-12610
CRM-12688
CRM-12499 - Add CRM_Utils_String::parsePrefix

----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
  http://issues.civicrm.org/jira/browse/CRM-12499
CRM-12499 - CRM_Core_Permission_Base::translatePermission

Add helper function translatePermission which translates an expression like
"administer CiviCRM", "cms:view user account", or "drupal:access user
profiles" into something understood by native CMS.

Use translatePermission as part of check() in D6, D7, WP.

Use placeholder permssions ALWAYS_ALLOW_PERMISSION and
ALWAYS_DENY_PERMISSION for select corner cases.

----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
  http://issues.civicrm.org/jira/browse/CRM-12499
CRM-12499 - CRM_Core_Permission_Joomla - Add translation

----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
  http://issues.civicrm.org/jira/browse/CRM-12499
CRM-12499 - Allow users with 'access user profiles' access to userRecordUrl

----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
  http://issues.civicrm.org/jira/browse/CRM-12499
CRM-10692 - commit andrew hunt patch. rework in next commit

----------------------------------------
* CRM-10692: unable to override /CRM/Core/Utils.php from extension
  http://issues.civicrm.org/jira/browse/CRM-10692
Merge pull request #862 from dlobo/CRM-10682

CRM-10692 - commit andrew hunt patch. rework in next commit
CRM-12688
CRM-11320 this makes the api stable from 4.2 to 4.3

Conflicts:

	api/v3/Contribution.php
CRM-11320 fix error in test
CRM-12160 Fix domain on navigation inserts

Conflicts:

	CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
	CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl