From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 27 Jul 2013 13:57:48 +0000 (+0100)
Subject: Merge branch 'master' into transp_logging_1031
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/c04cf318cb6c0ea42d2c3e37262ac68f282fdbe4?hp=e2016f158a749c1966618e25adfa19387b6bad3b

Merge branch 'master' into transp_logging_1031

Conflicts:
	src/src/expand.c
---

diff --git a/src/src/expand.c b/src/src/expand.c
index ac914707a..1674c5fb5 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1908,8 +1908,8 @@ while (i < nsub)
 DEBUG(D_expand)
   debug_printf("expanding: acl: %s  arg: %s%s\n",
     sub[0],
-    acl_narg>0 ? acl_arg[0]   : US"<none>",
-    acl_narg>1 ? " +more" : "");
+    acl_narg>0 ? acl_arg[0] : US"<none>",
+    acl_narg>1 ? " +more"   : "");
 
 ret = acl_eval(acl_where, sub[0], user_msgp, &tmp);