-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id

CRM-10164

Crm 12768 fix custom field option group handling

CRM-12689

CRM-12490, towards issues raised by dgg

----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
  http://issues.civicrm.org/jira/browse/CRM-12490

Conflicts:
	CRM/Case/Form/Activity.php
	CRM/Contact/Form/Search/Custom/ContribSYBNT.php
	CRM/Contact/Form/Search/Custom/ContributionAggregate.php
	CRM/Contact/Form/Search/Custom/EventAggregate.php
	CRM/Contact/Form/Search/Custom/PriceSet.php
	CRM/Contact/Form/Search/Custom/TagContributions.php
	CRM/Core/BAO/ConfigSetting.php
	CRM/Financial/BAO/FinancialType.php
	CRM/Report/Form.php
	CRM/Report/Form/Campaign/SurveyDetails.php
	CRM/Report/Form/Contribute/Summary.php
	sql/civicrm_generated.mysql
	templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
	tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php

Escape sql in contact.getquick api

fixed incorrect report instance id's in sample dashlets

mk-drupal-test-site - Pass through DBLOAD option

php 5.4 notice fixes

fix for bar chart and pie chart not displaying for event income summary ...

-- CRM-12741 webtest

CRM-12623, improvements w.r.t custom table joins and notice fixes

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

php 5.4, notice fixes

GenCode:

 * Remove shell_exec dependency.
 * In the web footer, report the same version number used everywhere else

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464