From: Joshua Colp Date: Tue, 5 Jan 2016 11:55:55 +0000 (-0600) Subject: Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime" X-Git-Tag: 14.0.0-beta1~496 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c62e0a55cc5480b370ea7a4ab291b0842f3a133;p=thirdparty%2Fasterisk.git Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime" --- 0c62e0a55cc5480b370ea7a4ab291b0842f3a133