Merge remote branch 'fsorig/master'

Conflicts:
	src/mod/applications/mod_commands/mod_commands.c
	src/mod/endpoints/mod_portaudio/mod_portaudio.c
	src/mod/endpoints/mod_portaudio/pablio.c

diff --cc src/include/switch_ivr.h
Simple merge

diff --cc src/mod/applications/mod_commands/mod_commands.c
index ae844638683159e9d378f714c96b66bc00dfee18,86d1e46d65a574e48a29f866e71e38a3428fb738..40fe306d68494e91aee04ae4f74f9425c0fdee5e
--- 1/src/mod/applications/mod_commands/mod_commands.c
--- 2/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@@ -5091,7 -5238,7 +5266,8 @@@ SWITCH_MODULE_LOAD_FUNCTION(mod_command
        SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX);
 +      SWITCH_ADD_API(commands_api_interface, "uuid_outgoing_answer", "Answer Outgoing Channel", outgoing_answer_function, OUTGOING_ANSWER_SYNTAX);
+       SWITCH_ADD_API(commands_api_interface, "uuid_limit", "Increase limit resource", uuid_limit_function, LIMIT_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "uuid_limit_release", "Release limit resource", uuid_limit_release_function, LIMIT_RELEASE_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "uuid_loglevel", "set loglevel on session", uuid_loglevel, UUID_LOGLEVEL_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX);
@@@ -5210,7 -5360,7 +5389,8 @@@
        switch_console_set_complete("add uuid_hold ::console::list_uuid");
        switch_console_set_complete("add uuid_jitterbuffer ::console::list_uuid");
        switch_console_set_complete("add uuid_kill ::console::list_uuid");
 +      switch_console_set_complete("add uuid_outgoing_answer ::console::list_uuid");
+       switch_console_set_complete("add uuid_limit ::console::list_uuid");
        switch_console_set_complete("add uuid_limit_release ::console::list_uuid");
        switch_console_set_complete("add uuid_loglevel ::console::list_uuid console");
        switch_console_set_complete("add uuid_loglevel ::console::list_uuid alert");

diff --cc src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 743a6568fbd3f3cce75e00a23dcf8fb154d7e721,8564a771e5185a2d1c2067b5de70ff9d561dc20f..f84fdeee96b9b656d6536092004220631646412c
--- 1/src/mod/endpoints/mod_portaudio/mod_portaudio.c
--- 2/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@@ -1776,7 -1205,7 +1776,7 @@@ static switch_status_t load_config(void
  
        if (globals.ringdev < 0) {
                if (globals.outdev > -1) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No ring device configured, using output device\n");
 -                      switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid or no ring device configured, using output device as ring device\n");
++                      switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid or no ring device configured, using output device as ring device\n");
                        globals.ringdev = globals.outdev;
                }
        }

diff --cc src/switch_ivr.c
Simple merge

diff --cc src/switch_ivr_originate.c
Simple merge