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)

Trivial merge