From 3af507cc43eadbfdae3347f0c755b7594c3efd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Mon, 25 May 2015 15:23:38 +0200
Subject: [PATCH] Fix merging of not yaml config files

---
 src/ejabberd_config.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 4931fe72e..fb5063775 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -391,7 +391,9 @@ include_config_files(Terms) ->
                                                     dict:store(Name, Val, Dict);
                                                 _ ->
                                                     dict:update(rest, fun(L1) -> [Pair|L1] end, Dict)
-                                            end
+                                            end;
+                                       (Tuple, Dict2) ->
+                                            dict:update(rest, fun(L2) -> [Tuple|L2] end, Dict2)
                                     end, dict:from_list([{rest, []}]), L)
                 end,