Merge pull request #8320 from mlutfy/master-crm18518
authorcolemanw <coleman@civicrm.org>
Mon, 9 May 2016 00:36:58 +0000 (20:36 -0400)
committercolemanw <coleman@civicrm.org>
Mon, 9 May 2016 00:36:58 +0000 (20:36 -0400)
CRM-18518: ts() string fixes.


Trivial merge