----------------------------------------
* CRM-9794:
  http://issues.civicrm.org/jira/browse/CRM-9794

----------------------------------------
* CRM-9794:
  http://issues.civicrm.org/jira/browse/CRM-9794

----------------------------------------
* CRM-9794:
  http://issues.civicrm.org/jira/browse/CRM-9794

----------------------------------------
* CRM-9794: Remove API v2
  http://issues.civicrm.org/jira/browse/CRM-9794

----------------------------------------
* CRM-9794: Remove API v2
  http://issues.civicrm.org/jira/browse/CRM-9794

Remove patch to disable mails from PHP/drush

Remove patch to disable mails from PHP/drush, instead rely that the host will have a php.ini directive disabling sendmail. See: https://test.civicrm.org/job/CiviCRM-master-git/108/LABEL=debian6,SUITE=api_v3_AllTests/

CRM-12197 - fix notice

----------------------------------------
* CRM-12197: Overactive IDS causes test failure
  http://issues.civicrm.org/jira/browse/CRM-12197

CRM-12197 - add skip IDS check permission

----------------------------------------
* CRM-12197: Overactive IDS causes test failure
  http://issues.civicrm.org/jira/browse/CRM-12197

CRM-10935 - fix typo in xml

----------------------------------------
* 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-10935

CRM-12417 format activity date during import

notice fixes towards CRM-12623

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

----------------------------------------
* 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-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

Always symlink to civicrm, since source directory may have another name, ex: civicrm43

Conflicts:
	.gitignore
	CRM/Financial/Form/FinancialAccount.php
	CRM/Financial/Form/FinancialTypeAccount.php
	CRM/Grant/Controller/PaymentSearch.php
	CRM/Grant/Page/GrantProgram.php
	CRM/Grant/Page/Payment.php
	CRM/Grant/Selector/PaymentSearch.php
	CRM/Report/Form/Event/ParticipantListCount.php
	CRM/Utils/Migrate/Export.php
	CRM/Utils/Migrate/ExportJSON.php
	sql/civicrm_generated.mysql
	templates/CRM/Admin/Form/Preferences/Display.tpl
	templates/CRM/Financial/Form/FinancialTypeAccount.tpl
	templates/CRM/Grant/Form/Search.tpl

mk-drupal-test-site: added help text, option to restore .sql dump, and do not send welcome e-mail

Added help function, a bit more error checking, and allow to restore a .sql to be used on the test site.

manually merging https://github.com/civicrm/civicrm-core/pull/802

Conflicts:
	CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl

CRM-12466, add configuration for displaying smart groups in Contact Summary > Groups tab

fix for CRM-11310 : applied patch

CRM-12510. There were no webtests for copying a contribution page or cop...

-- worked on CRM-12665

----------------------------------------
* CRM-12665: Remove unwanted files in Grant
  http://issues.civicrm.org/jira/browse/CRM-12665

fix more php5.3 notices

CRM-12646