From: colemanw <coleman@civicrm.org>
Date: Tue, 9 Feb 2016 20:06:14 +0000 (-0500)
Subject: Merge pull request #7774 from totten/master-dash-err
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c5906cd389825b4f2fc5ad50d2c7b67eb581f813;p=civicrm-core.git

Merge pull request #7774 from totten/master-dash-err

CRM-17982 - CRM_Core_Config_MagicMerge - Fix warning on demos sites
---

c5906cd389825b4f2fc5ad50d2c7b67eb581f813