From: Phil Pennock <pdp@exim.org>
Date: Wed, 21 Mar 2012 08:45:59 +0000 (-0700)
Subject: Merge branch 'dbmjz'
X-Git-Tag: exim-4_80_RC1~76
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/c45dd1801a10dc40580d422218ae8bfcd7128fc8

Merge branch 'dbmjz'
---

c45dd1801a10dc40580d422218ae8bfcd7128fc8
diff --cc doc/doc-txt/ChangeLog
index 1cd08bf70,9aca72920..f24e1a8f9
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -37,8 -37,8 +37,10 @@@ PP/08 cyrus_sasl server now expands th
  PP/09 Bugzilla 1214 - Log authentication information in reject log.
        Patch by Jeremy Harris.
  
- PP/10 Let heimdal_gssapi authenticator take a SASL message without an authzid.
+ PP/10 Added dbmjz lookup type.
+ 
++PP/11 Let heimdal_gssapi authenticator take a SASL message without an authzid.
 +
  
  Exim version 4.77
  -----------------