Merge "core: Show streams in "core show channel"."
authorzuul <zuul@gerrit.asterisk.org>
Wed, 22 Feb 2017 17:40:02 +0000 (11:40 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 22 Feb 2017 17:40:02 +0000 (11:40 -0600)

Trivial merge