Merge "res_rtp_asterisk: rtcp mux using the wrong srtp unprotecting algorithm"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 24 May 2017 16:25:58 +0000 (11:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 24 May 2017 16:25:58 +0000 (11:25 -0500)

Trivial merge