Merge "res_pjsip: Add contact_user to endpoint"
authorzuul <zuul@gerrit.asterisk.org>
Fri, 19 Aug 2016 15:08:11 +0000 (10:08 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 19 Aug 2016 15:08:11 +0000 (10:08 -0500)

Trivial merge