From: colemanw <coleman@civicrm.org>
Date: Thu, 12 Nov 2015 17:30:49 +0000 (-0500)
Subject: Merge pull request #7193 from systopia/CRM-17555
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=02d3128d616c2ed7351b9b312c2c6694e7754a14;p=civicrm-core.git

Merge pull request #7193 from systopia/CRM-17555

proposed fix for CRM-17555
---

02d3128d616c2ed7351b9b312c2c6694e7754a14