]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_asterisk.c: Fix compile error if libsrtp is not installed." into 13
authorJoshua Colp <jcolp@digium.com>
Sat, 18 Mar 2017 10:36:14 +0000 (05:36 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 18 Mar 2017 10:36:15 +0000 (05:36 -0500)

Trivial merge