From: Joshua Colp Date: Tue, 5 Jan 2016 11:56:04 +0000 (-0600) Subject: Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime" into 13 X-Git-Tag: 13.8.0-rc1~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=937ba51659f9a94f7129bccddbc89554b1f38fb2;p=thirdparty%2Fasterisk.git Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime" into 13 --- 937ba51659f9a94f7129bccddbc89554b1f38fb2