]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Fix deadlock on presence state changes." into 13
authorJoshua Colp <jcolp@digium.com>
Mon, 31 Aug 2015 21:11:34 +0000 (16:11 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 31 Aug 2015 21:11:35 +0000 (16:11 -0500)

Trivial merge