automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28702 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6dae296bc94eeba1afc84813999fbfeb9268007f..847063a5babe30a1921866aecb5c9b1d425b3f7a 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10718,6 +10718,8 @@ static int setup_zap(int reload)
                                                v->value, v->lineno);
                        } else if (!strcasecmp(v->name, "minunused")) {
                                minunused = atoi(v->value);
+                       } else if (!strcasecmp(v->name, "minidle")) {
+                               minidle = atoi(v->value); 
                        } else if (!strcasecmp(v->name, "idleext")) {
                                ast_copy_string(idleext, v->value, sizeof(idleext));
                        } else if (!strcasecmp(v->name, "idledial")) {