Merge "features: Fix channel datastore access."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 1 Jul 2016 16:12:48 +0000 (11:12 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 1 Jul 2016 16:12:48 +0000 (11:12 -0500)

Trivial merge