]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_musiconhold: Add kill_escalation_delay, kill_method to class" into 14
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 12 Jul 2017 10:33:14 +0000 (05:33 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Jul 2017 10:33:14 +0000 (05:33 -0500)

Trivial merge