From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 6 Dec 2016 20:20:44 +0000 (+1300)
Subject: Merge pull request #9499 from eileenmcnaughton/4.7.14-rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5380467e798d69c857c2ef9894aa906db586ac83;p=civicrm-core.git

Merge pull request #9499 from eileenmcnaughton/4.7.14-rc

CRM-19298 further fix on templates.
---

5380467e798d69c857c2ef9894aa906db586ac83