Merge pull request #3507 from totten/master-fts-misc
authorTim Otten <to-git@think.hm>
Tue, 17 Jun 2014 02:27:17 +0000 (19:27 -0700)
committerTim Otten <to-git@think.hm>
Tue, 17 Jun 2014 02:27:17 +0000 (19:27 -0700)
CRM-14811 - Full Text - Move settings. Merge NYSS changes.


Trivial merge