From: Todd Lyons <tlyons@exim.org>
Date: Tue, 15 Apr 2014 16:53:43 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.exim.org/home/git/exim
X-Git-Tag: exim-4_83_RC1~56
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/364e49ab87bf81774f12f8b0e21509eb51c88b71

Merge branch 'master' of ssh://git.exim.org/home/git/exim

Fixed Conflicts:
	doc/doc-txt/ChangeLog
---

364e49ab87bf81774f12f8b0e21509eb51c88b71
diff --cc doc/doc-txt/ChangeLog
index c459a0f40,cc136b83c..17e8091ce
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -64,8 -64,15 +64,17 @@@ JH/09 Bugzilla 1431: Support (with limi
  JH/10 Bugzilla 1005: ACL "condition =" should accept values which are negative
        numbers.  Touch up "bool" conditional to keep the same definition.
  
 +TL/06 Remove duplicated language in spec file from 4.82 TL/16.
 +
+ JH/11 Add dnsdb tlsa lookup.  From Todd Lyons.
+ 
+ JH/12 Expand items in router/transport headers_add or headers_remove lists
+       individually rather than the list as a whole.  Bug 1452.
+ 
+       Required for reasonable handling of multiple headers_ options when
+       they may be empty; requires that headers_remove items with embedded
+       colons must have them doubled (or the list-separator changed).
+ 
  
  Exim version 4.82
  -----------------