Merge pull request #7193 from systopia/CRM-17555
authorcolemanw <coleman@civicrm.org>
Thu, 12 Nov 2015 17:30:49 +0000 (12:30 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 12 Nov 2015 17:30:49 +0000 (12:30 -0500)
proposed fix for CRM-17555


Trivial merge