summaryrefslogtreecommitdiff
path: root/doc/doc-txt
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-07-08 22:53:30 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-07-08 22:53:30 +0100
commitb5a70bdfa38bcc3e1143f8fe6f63e7613f03e690 (patch)
tree08befecbddd7006b0f0a6224ad4433640c8df220 /doc/doc-txt
parent846726c5a374d833fb5211dde62ae6bceb6841c7 (diff)
parent6822b9097e418e9a0e6cb1a31430904a38a49986 (diff)
Merge branch 'master' of git://git.exim.org/exim
Diffstat (limited to 'doc/doc-txt')
-rw-r--r--doc/doc-txt/ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index be52bf98f..108f6051e 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -33,6 +33,8 @@ PP/07 Handle "exim -L <tag>" to indicate to use syslog with tag as the process
TL/01 Bugzilla 1258 - Refactor MAIL FROM optional args processing.
+TL/02 Add +smtp_confirmation as a default logging option.
+
JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.
JH/02 Support "G" suffix to numbers in ${if comparisons.