Merge "res_pjsip_config_wizard: Add command to export primitive objects"
authorzuul <zuul@gerrit.asterisk.org>
Tue, 23 Feb 2016 23:41:35 +0000 (17:41 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 23 Feb 2016 23:41:35 +0000 (17:41 -0600)
1  2 
CHANGES

diff --cc CHANGES
Simple merge