Merge pull request #7436 from mlutfy/47-crm17695
authorDave Greenberg <dave@civicrm.org>
Sat, 12 Dec 2015 00:12:12 +0000 (16:12 -0800)
committerDave Greenberg <dave@civicrm.org>
Sat, 12 Dec 2015 00:12:12 +0000 (16:12 -0800)
CRM-17695: ts() fixes.


Trivial merge