Merge pull request #2691 from atif-shaikh/CRM-14259
authorcolemanw <coleman@civicrm.org>
Tue, 18 Mar 2014 17:42:50 +0000 (13:42 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 18 Mar 2014 17:42:50 +0000 (13:42 -0400)
Crm 14259


Trivial merge