Merge pull request #7660 from JMAConsulting/CRM-16188-2
authorcolemanw <coleman@civicrm.org>
Wed, 27 Jan 2016 14:42:51 +0000 (09:42 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 27 Jan 2016 14:42:51 +0000 (09:42 -0500)
Crm 16188 2


Trivial merge