Merge "channel: Protect flags in ast_waitfor_nandfds operation."
authorzuul <zuul@gerrit.asterisk.org>
Tue, 14 Feb 2017 19:31:01 +0000 (13:31 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 14 Feb 2017 19:31:01 +0000 (13:31 -0600)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge