Merge "res_pjsip: Add AMI action 'PJSIPShowAors'"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 3 Jan 2018 21:29:36 +0000 (15:29 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 3 Jan 2018 21:29:36 +0000 (15:29 -0600)

Trivial merge