]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip: Add global option to limit the maximum time for initial qualifies...
authorMatt Jordan <mjordan@digium.com>
Fri, 17 Apr 2015 15:30:37 +0000 (10:30 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 17 Apr 2015 15:30:37 +0000 (10:30 -0500)

Trivial merge