Merge pull request #3543 from eileenmcnaughton/CRM-14850
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 23 Jun 2014 23:26:07 +0000 (11:26 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 23 Jun 2014 23:26:07 +0000 (11:26 +1200)
CRM-14850 - some settings transition to setting from config


Trivial merge