]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_session: Handle race condition at shutdown with timer."
authorJoshua Colp <jcolp@digium.com>
Tue, 21 Jun 2016 23:53:33 +0000 (18:53 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 21 Jun 2016 23:53:33 +0000 (18:53 -0500)

Trivial merge