Merge pull request #8531 from PalanteJon/CRM-16888
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jun 2016 00:26:50 +0000 (18:26 -0600)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jun 2016 00:26:50 +0000 (18:26 -0600)
CRM-16888 - CiviSMS - fix templates not working with CiviSMS


Trivial merge