Merge pull request #1380 from totten/master-reapply-1371
authorTim Otten <to-git@think.hm>
Fri, 9 Aug 2013 00:30:02 +0000 (17:30 -0700)
committerTim Otten <to-git@think.hm>
Fri, 9 Aug 2013 00:30:02 +0000 (17:30 -0700)
CRM-12930 Always use Smarty security for string templates


Trivial merge