CRM-13966 - Change frozen markup to use span not div
Merge pull request #2913 from colemanw/master

CRM-13966 - Change frozen markup to use span not div