From: colemanw <coleman@civicrm.org>
Date: Thu, 19 Nov 2015 23:32:37 +0000 (-0500)
Subject: Merge pull request #7254 from monishdeb/CRM-17417
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=eb04ac49fdce2ee873b7a25e4d7ee07cc09561af;p=civicrm-core.git

Merge pull request #7254 from monishdeb/CRM-17417

CRM-17417 and CRM-17418 fixes
---

eb04ac49fdce2ee873b7a25e4d7ee07cc09561af