From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/confs/0564 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/confs/0564')

diff --git a/test/confs/0564 b/test/confs/0564
index d9530e69a..6a23896ef 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -1,11 +1,13 @@
 # Exim test configuration 0564
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
 tls_advertise_hosts =
 
 # ----- Main settings -----
-- 
cgit v1.2.3