Merge "res_pjsip contact: Lock expiration/addition of contacts"
authorzuul <zuul@gerrit.asterisk.org>
Mon, 11 Apr 2016 21:29:34 +0000 (16:29 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 11 Apr 2016 21:29:34 +0000 (16:29 -0500)

Trivial merge