]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_session: Handle race condition at shutdown with timer." into 13
authorzuul <zuul@gerrit.asterisk.org>
Wed, 22 Jun 2016 00:04:29 +0000 (19:04 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 22 Jun 2016 00:04:29 +0000 (19:04 -0500)

Trivial merge