Merge "res_pjsip: Change default from user value."
authorJoshua Colp <jcolp@digium.com>
Sat, 5 Sep 2015 20:56:58 +0000 (15:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 5 Sep 2015 20:56:59 +0000 (15:56 -0500)

Trivial merge