Merge changelog updates.

diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index b7cc7ce..b96a4bf 100644 (file)
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -38,9 +38,16 @@ v4.0-cvs
 
 
 ----------
-v3.3.7-cvs
+v3.3.8-cvs
 ----------
 
+
+
+
+------
+v3.3.7
+------
+
 [mjr] Fix issue in Horde_Image that would cause generated images to lose
       transparency in certain situations.
 [jan] Allow to update existing identities while requiring email confirmation

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 0712ae4..5032f90 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -161,14 +161,22 @@ v5.0-git
 
 
 ----------
-v4.3.7-cvs
+v4.3.8-cvs
 ----------
 
+
+
+
+------
+v4.3.7
+------
+
 [mms] Fix spellcheck-on-send when using fckeditor and no errors exist
       (Bug #8833).
-[mms] Fix authenticate API call (Bug #8872; robin.west@dal.ca).
-[mms] Optimize folder tree initialization (Ticket #8805).
-[mms] Add command line fetchmail script (tjacyno@galasoft.net, Ticket #8812).
+[mms] Fix authenticate API call and synchronization when using realms
+      (robin.west@dal.ca, Bugs #6749, #8872).
+[mms] Optimize folder tree initialization (Request #8805).
+[mms] Add command line fetchmail script (tjacyno@galasoft.net, Request #8812).
 [jan] Workaround broken PHP number formatting with some locales (Bug #8780).
 
 

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index b90cb59..200d294 100644 (file)
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -7,9 +7,16 @@ v2.0-git
 
 
 ----------
-v1.2.4-cvs
+v1.2.5-cvs
 ----------
 
+
+
+
+------
+v1.2.4
+------
+
 [jan] Correctly escape addresses in procmail driver (Bug #8875).
 [jan] Fix procmail scripts when using composite headers (Bug #8804).
 [jan] Support some non-standard Date: headers in Sieve vacation rules

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 500d605..8cae689 100644 (file)
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -28,18 +28,25 @@ v3.0-git
 
 
 ----------
-v2.3.4-cvs
+v2.3.5-cvs
 ----------
 
+
+
+
+------
+v2.3.4
+------
+
 [jan] Delete Horde alarms when resetting an event alarm.
 [jan] Set an alarm to one minute, if users try to set an alarm without time.
+[gwr] Fix editing the start date of recurring events (kolab/issue3885).
 
 
 ------
 v2.3.3
 ------
 
-[gwr] Fix editing the start date of recurring events (kolab/issue3885).
 [jan] Fix editing URLs of remote calendars.
 [gwr] Fix recurring weekly events with fixed number of occurences but multiple
       incidences per week (kolab/issue3846).

diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
index 9fa8ef8..5a06533 100644 (file)
--- a/nag/docs/CHANGES
+++ b/nag/docs/CHANGES
@@ -12,9 +12,16 @@ v3.0-git
 
 
 ----------
-v2.3.5-cvs
+v2.3.6-cvs
 ----------
 
+
+
+
+------
+v2.3.5
+------
+
 [jan] Set an alarm to one minute, if users try to set an alarm without time.
 [jan] Add missing preference for not sending update notifications to yourself
       (Joel Smith <js-horde@jk1.net>, Request #8978).

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
index 4913ba7..16ef1ff 100644 (file)
--- a/turba/docs/CHANGES
+++ b/turba/docs/CHANGES
@@ -7,14 +7,20 @@ v3.0-git
       (Request #8504).
 
 ----------
-v2.3.4-cvs
+v2.3.5-cvs
 ----------
 
+
+
+
+------
+v2.3.4
+------
+
 [jan] Remove deleted contacts from distribution lists in the same address book.
 [mjr] Allow creation of default, personal address book when other read-only
       sources are present.
-[mjr] Log deletion in History  when deleting all of a user's contacts
-      (Bug #8755).
+[mjr] Log in history when deleting all of a user's contacts (Bug #8755).
 [jan] Only export non-empty fields if exporting manually.
 [jan] Add export to vCard 3.0.
 [jan] Only synchronize those fields that are supported by the client