Merge "channel: ast_write frame wrongly freed after call to audiohooks"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 7 Jun 2017 13:07:10 +0000 (08:07 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 7 Jun 2017 13:07:10 +0000 (08:07 -0500)

Trivial merge