Merge pull request #7254 from monishdeb/CRM-17417
authorcolemanw <coleman@civicrm.org>
Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)
commiteb04ac49fdce2ee873b7a25e4d7ee07cc09561af
treefb72a31eddba3d0ceb689f9eedaee0b72674315a
parent4a0ef338dfe8eb2531ce0f15e83d9f0208c49714
parentbd265d68f6eb7e2f881eafc7272336729483beb1
Merge pull request #7254 from monishdeb/CRM-17417

CRM-17417 and CRM-17418 fixes