From: Joshua Colp <jcolp@digium.com>
Date: Wed, 12 Jul 2017 10:48:01 +0000 (-0500)
Subject: Merge "res_musiconhold:  Add kill_escalation_delay, kill_method to class"
X-Git-Tag: 15.0.0-beta1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b27bb100b010060cecfa52b4d2bc1240ad5092a;p=thirdparty%2Fasterisk.git

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

8b27bb100b010060cecfa52b4d2bc1240ad5092a