Merge pull request #6220 from monishdeb/CRM-16828
authorcolemanw <coleman@civicrm.org>
Wed, 15 Jul 2015 14:01:57 +0000 (10:01 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 15 Jul 2015 14:01:57 +0000 (10:01 -0400)
Crm 16828: Backport CRM-16575 changes to 4.6


Trivial merge