Merge "features.conf.sample: Clarify ActivatedBy documentation wording."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 27 Nov 2017 21:57:05 +0000 (15:57 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 27 Nov 2017 21:57:05 +0000 (15:57 -0600)

Trivial merge