From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 16 Sep 2005 08:10:18 +0000 (+0000)
Subject: mod_vhost_ldap: 0.2.6 version
X-Git-Tag: upstream/0.2.6
X-Git-Url: http://andersk.mit.edu/gitweb/mod-vhost-ldap.git/commitdiff_plain/6b8cfc2591f865fd4937f98c49707c2f004e54c2

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 712c2e3..c18ff99 100644
--- 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 3a4036f..53a75d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.5
+0.2.6