Merge "func_channel.c: Update MASTER_CHANNEL documentation"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 29 Dec 2017 19:40:31 +0000 (13:40 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 29 Dec 2017 19:40:31 +0000 (13:40 -0600)

Trivial merge