Merge pull request #9499 from eileenmcnaughton/4.7.14-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)
committerGitHub <noreply@github.com>
Tue, 6 Dec 2016 20:20:44 +0000 (09:20 +1300)
commit5380467e798d69c857c2ef9894aa906db586ac83
tree3132392addb136a310c4cf92f097e329fd0ce3de
parent0018094c0b3d8f8acf60cd2313156cf77d5a86e3
parent735eaff9062ed1cef41919bc14d1ef28d19e750f
Merge pull request #9499 from eileenmcnaughton/4.7.14-rc

CRM-19298 further fix on templates.