mod_vhost_ldap: 0.2.6 version

git-svn-id: svn://svn.debian.org/svn/modvhostldap/mod-vhost-ldap@25 4dd36cbf-e3fd-0310-983d-db0e06859cf4

diff --git a/ChangeLog b/ChangeLog
index 712c2e333bc65d820df1c28ddc10d2770980fa84..c18ff99df49e4c57c07fba6f75eac683479e16c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-16 Ondřej Surý <ondrej@sury.org
+       * mod_vhost_ldap.c: implement merge_server_config to allow different settings for different vhosts
+       * VERSION: 0.2.6 release
+
 2005-09-09 Ondřej Surý <ondrej@sury.org>
        * mod_vhost.ldap.c: implement workaround for fault mod_ldap caching
                            http://issues.apache.org/bugzilla/show_bug.cgi?id=33901

diff --git a/VERSION b/VERSION
index 3a4036fb450f1771defbe73fe2904f3f841adcb5..53a75d673557d58396701acba277e495b625f4ee 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.5
+0.2.6