]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential." into 14
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 28 Sep 2017 11:47:26 +0000 (06:47 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 28 Sep 2017 11:47:26 +0000 (06:47 -0500)

Trivial merge