]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "taskprocessor.c: Increase CLI "core ping taskprocessor" timeout."
authorMark Michelson <mmichelson@digium.com>
Wed, 20 Jan 2016 20:19:02 +0000 (14:19 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 20 Jan 2016 20:19:02 +0000 (14:19 -0600)
1  2 
main/taskprocessor.c

Simple merge