merge up to branch 1.2 and re-enable automerge

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 1 deletions

diff --git a/config.c b/config.c
index 989cd0b15..75b3f6ee7 100644
--- a/config.c
+++ b/config.c
@@ -651,7 +651,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
 				if (process_buf) {
 					char *buf = ast_strip(process_buf);
 					if (!ast_strlen_zero(buf)) {
-						if (process_text_line(cfg, &cat, buf, lineno, filename)) {
+						if (process_text_line(cfg, &cat, buf, lineno, fn)) {
 							cfg = NULL;
 							break;
 						}