From: colemanw <coleman@civicrm.org>
Date: Wed, 14 Jan 2015 02:28:27 +0000 (-0500)
Subject: Merge pull request #4930 from colemanw/CRM-15817
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7b8d1e63a7914120975887eaa324302e6ad11f36;p=civicrm-core.git

Merge pull request #4930 from colemanw/CRM-15817

CRM-15817 - Fix merge error
---

7b8d1e63a7914120975887eaa324302e6ad11f36