X-Git-Url: http://andersk.mit.edu/gitweb/mod-vhost-ldap.git/blobdiff_plain/8196fae380063c2518855921d02f71a31decd9cd..6b8cfc2591f865fd4937f98c49707c2f004e54c2:/ChangeLog

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