Merge pull request #6618 from mallezie/crm-17106
authorcolemanw <coleman@civicrm.org>
Fri, 28 Aug 2015 14:18:49 +0000 (10:18 -0400)
committercolemanw <coleman@civicrm.org>
Fri, 28 Aug 2015 14:18:49 +0000 (10:18 -0400)
crm-17106 add custom fields to message template


Trivial merge