Sync with branches.

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index e981851..bb7a328 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -68,10 +68,10 @@ v4.3.4-cvs
 [jan] If updating a calendar event fails, try to import it instead (Bug #7589).
 [mms] Fix [un]escaping of various URLs on message screen caused by security
       fixes in v4.3.3 (Bug #7926).
-[mms] Add hook to allow hiding of IMAP folders (Request #7353, Gunnar
-      Wrobel <p@rdus.de>).
 [jan] Fix rendering of subjects in RTL scripts when using LTR translations
       (vilius@lnk.lt, Bug #3511).
+[mms] Add hook to allow hiding of IMAP folders (Request #7353, Gunnar
+      Wrobel <p@rdus.de>).
 [jan] Fix logging of messages forwarded with attachments (Bug #7911).
 
 
@@ -79,7 +79,7 @@ v4.3.4-cvs
 v4.3.3
 ------
 
-[cjh] SECURITY: Escape output in pgp.php and smime.php
+[cjh] SECURITY: Escape output in message.php, pgp.php and smime.php
       (found by Gunnar Wrobel <p@rdus.de>).
 [jan] Use all credentials and mailer settings for iTip replies (Bug #7388).
 [mms] Show translated 'INBOX' prefix for subfolders (Request #7759).
@@ -107,7 +107,6 @@ v4.3.1
 [jan] Use mailer configuration when sending iTip replies (Bug #7388).
 [jan] Always display multipart/appledouble attachments.
 [mms] Upgrade prototype.js to v1.6.0.3.
-[jan] Escape output in test.php.
 
 
 ----

diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index 6562e94..5596c14 100644 (file)
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -23,6 +23,7 @@ v2.3.1-cvs
 [jan] Empty view cache when changing calendar selection
       (stpierre@nebrwesleyan.edu, Bug #7879).
 [mjr] Fix category CSS being included on embedded widgets.
+[cjh] Work around BC break with Horde versions before 3.2 (Bug #7820).
 [jan] Allow to manually change attendee responses (paul@carnie.com.au,
       Request #7443).
 [jan] Fix linking to last week across certain year boundaries (Bug #7827).
@@ -33,6 +34,7 @@ v2.3.1-cvs
       reminders through Kronolith (develop@kristov.de, Bug #7038).
 [cjh] Add a PostgreSQL-specific upgrade script for 2.2 to 2.3
       (michael.menge@zdv.uni-tuebingen.de, Bug #7454).
+[mms] Upgrade prototype.js to v1.6.0.3.
 
 
 ----