Merge "CHANGES: Add AMI action 'PJSIPShowContacts' note."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 25 Jan 2018 13:56:31 +0000 (07:56 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 25 Jan 2018 13:56:31 +0000 (07:56 -0600)

Trivial merge