Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime"
authorJoshua Colp <jcolp@digium.com>
Tue, 5 Jan 2016 11:55:55 +0000 (05:55 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 5 Jan 2016 11:55:56 +0000 (05:55 -0600)
commit0c62e0a55cc5480b370ea7a4ab291b0842f3a133
treea589b6ab628a552205d0e93c662a447bc7e990c0
parentf88b9520939fe35c31b1d889648ae34db1fccd4e
parent6d18fe151c0e88924737c8b7a986a7278fd120bc
Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime"