From: colemanw <coleman@civicrm.org>
Date: Fri, 10 Apr 2015 21:30:35 +0000 (-0400)
Subject: Merge pull request #5617 from colemanw/CRM-15916
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9768c5b7cc7c97fc09dbfec606fd6417d396ca7a;p=civicrm-core.git

Merge pull request #5617 from colemanw/CRM-15916

CRM-15916 - Revert bad merge
---

9768c5b7cc7c97fc09dbfec606fd6417d396ca7a