Merge "contrib/script/sip_to_pjsip: implement 'all' for allow/disallow"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 17 Oct 2017 14:32:00 +0000 (09:32 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 17 Oct 2017 14:32:00 +0000 (09:32 -0500)

Trivial merge