]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6919daa ed13732)
Merge "Confbridge: Add a user timeout option"
authorJoshua Colp <jcolp@digium.com>
Tue, 17 Nov 2015 14:12:26 +0000 (08:12 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 17 Nov 2015 14:12:27 +0000 (08:12 -0600)

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