From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 12 Jun 2012 20:43:58 +0000 (+0100)
Subject: Merge branch 'lists'
X-Git-Tag: exim-4_81_RC1~54
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/585121e2682545b7afa599e039a7a1e2b1804570

Merge branch 'lists'
---

585121e2682545b7afa599e039a7a1e2b1804570
diff --cc doc/doc-txt/ChangeLog
index bd0628637,1bf2cd06b..34521098e
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -39,9 -39,9 +39,11 @@@ JH/02 Support "G" suffix to numbers in 
  
  PP/08 Handle smtp transport tls_sni option forced-fail for OpenSSL.
  
 -JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
 +NM/01 Bugzilla 1197 - Spec typo
 +      Bugzilla 1196 - Spec examples corrections
  
++JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
+ 
  Exim version 4.80
  -----------------