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

Fixed Conflicts:
	doc/doc-txt/ChangeLog

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
index c459a0f40d2ebc2cacb2fb9613ed4995b1d0060b,cc136b83cca8d27358f62798cd888b9970fdad2a..17e8091cefcf938f96c86b817b1bd60b8d663a9c
--- 1/doc/doc-txt/ChangeLog
--- 2/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
  -----------------