From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Wed, 12 Jul 2017 10:33:14 +0000 (-0500)
Subject: Merge "res_musiconhold:  Add kill_escalation_delay, kill_method to class" into 14
X-Git-Tag: 14.7.0-rc1~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd84b3d9f9be96bd7aa8a2758c245e156fefcf7a;p=thirdparty%2Fasterisk.git

Merge "res_musiconhold:  Add kill_escalation_delay, kill_method to class" into 14
---

fd84b3d9f9be96bd7aa8a2758c245e156fefcf7a