Merge pull request #5880 from eileenmcnaughton/CRM-16536
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 21 May 2015 01:09:05 +0000 (13:09 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 21 May 2015 01:09:05 +0000 (13:09 +1200)
CRM-16536 add settings overrides to template


Trivial merge