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

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

ec182b6d509fe8ef965ac0c11147db33f53e6ca9