From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 27 Jul 2015 19:00:46 +0000 (-0700)
Subject: Merge pull request #6296 from JMAConsulting/CRM-16187
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=14bd5d1b2dc2b2d57d74bbd41ac86d7a2df2df9e;p=civicrm-core.git

Merge pull request #6296 from JMAConsulting/CRM-16187

Crm 16187
---

14bd5d1b2dc2b2d57d74bbd41ac86d7a2df2df9e