From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 6 Jan 2016 17:42:15 +0000 (-0800)
Subject: Merge pull request #7546 from eileenmcnaughton/CRM-16259
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f8f1ee93b26b5d672502955cba9444ad592a1441;p=civicrm-core.git

Merge pull request #7546 from eileenmcnaughton/CRM-16259

Crm 16259
---

f8f1ee93b26b5d672502955cba9444ad592a1441