automerge commit

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

diff --git a/config.c b/config.c
index 75b3f6ee7106806624d569d541ba21c73df6b5f8..89c5c499dd770bed23ba478527686f7fb4fea8cc 100644 (file)
--- a/config.c
+++ b/config.c
@@ -966,6 +966,8 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con
 
        if (result)
                result->include_level--;
+       else
+               cfg->include_level--;
 
        return result;
 }