summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-02-22 06:36:39 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-02-22 06:36:39 (GMT)
commit33d115071360fd23a76fc6551f90a43e570bb238 (patch)
tree4ff1cf2cd163030635b1de68e5f5755ec79e11b8 /ChangeLog
parent2b1eb9926c94e9b9dd72831ef2ab3641df1fb1d7 (diff)
downloadkolab-server-33d115071360fd23a76fc6551f90a43e570bb238.tar.gz
* templates/freebusy.conf.template.in: Added ability to map
arbitrary ldap attributes to those expected by kolab. (Merged from suc branch) * templates/resmgr.conf.template.in: Added ability to map arbitrary ldap attributes to those expected by kolab. (Merged from suc branch)
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8132458..5740d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-22 Gunnar Wrobel <p@rdus.de>
+
+ * templates/freebusy.conf.template.in: Added ability to map
+ arbitrary ldap attributes to those expected by kolab.
+ (Merged from suc branch)
+
+ * templates/resmgr.conf.template.in: Added ability to map
+ arbitrary ldap attributes to those expected by kolab.
+ (Merged from suc branch)
+
2010-02-16 Gunnar Wrobel <p@rdus.de>
* templates/php.ini.template.in: Removed deprecated php.ini