CRM-15523 - Add sub-type custom fields to list of available tokens
Merge pull request #4439 from colemanw/CRM-15523

CRM-15523 - Add sub-type custom fields to list of available tokens