]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 524cf33 6744b09)
Merge "pbx: Deadlock between contexts container and context_merge locks" into 11
authorJoshua Colp <jcolp@digium.com>
Mon, 11 Jan 2016 23:37:05 +0000 (17:37 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 11 Jan 2016 23:37:05 +0000 (17:37 -0600)

Trivial merge
Mirror of https://github.com/asterisk/asterisk.git