From: colemanw <coleman@civicrm.org>
Date: Mon, 23 Nov 2015 16:03:51 +0000 (-0500)
Subject: Merge pull request #7266 from jmcclelland/CRM-17586-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=02d37a3e31df5ba1e24166c1136befc418254672;p=civicrm-core.git

Merge pull request #7266 from jmcclelland/CRM-17586-master

Crm 17586 master
---

02d37a3e31df5ba1e24166c1136befc418254672