Merge changelog updates.

diff --git a/ansel/docs/CHANGES b/ansel/docs/CHANGES
index e4ffe31..34cc945 100644 (file)
--- a/ansel/docs/CHANGES
+++ b/ansel/docs/CHANGES
@@ -7,17 +7,26 @@ v2.0-git
 
 
 ----------
-v1.1.1-cvs
+v1.1.2-cvs
 ----------
 
-[mjr] Fix default value for image_faces value in the database schema (Bug #8925)
+
+
+
+------
+v1.1.1
+------
+
+[mjr] Fix default value for image_faces value in the database schema
+      (Bug #8925).
 [mjr] Fix sending ecards when SMTP auth is set, but no global username/password
-      exists in the configuration (Bug #8924 horde (at) albasoft (dot) com).
-[mjr] Fix escaping location query for Postgres (Bug #8919).
-[mjr] Properly url encode and escape html when processing tags.
+      exists in the configuration (horde@albasoft@com, Bug #8924).
+[mjr] Fix escaping location query for PostgreSQL (Bug #8919).
+[mjr] Properly url-encode and escape html when processing tags.
 [mjr] Protect against divide-by-zero errors (Bug #8761).
 [jan] Fix invalid class name in block for recently geotagged images.
 
+
 ----
 v1.1
 ----
@@ -96,7 +105,7 @@ v1.0-RC1
       captions to the ansel.php CLI (dorm@dorm.org, Request #3986).
 [cjh] Implement drag-and-drop sorting of images.
 [mas] Fix undefined index warning if no galleries are defined (Bug #2172).
-[jan] Add Swedish translation (Andreas Dahlén <andreas@dahlen.ws>).
+[jan] Add Swedish translation (Andreas Dahlén <andreas@dahlen.ws>).
 [jan] Add Finnish translation (Leena Heino <liinu@uta.fi>).
 [jan] Add Lithuanian translation (Vilius Sumskas <vilius@lnk.lt>).
 [cjh] Use new Horde_Menu CSS styled menu.

diff --git a/chora/docs/CHANGES b/chora/docs/CHANGES
index 761a1f9..ab2c884 100644 (file)
--- a/chora/docs/CHANGES
+++ b/chora/docs/CHANGES
@@ -9,9 +9,17 @@ v3.0-git
 
 
 ----------
-v2.1.1-cvs
+v2.1.2-cvs
 ----------
 
+
+
+
+------
+v2.1.1
+------
+
+[jan] Fix method name when displaying patchsets (Bug #8714).
 [mms] Upgrade prototype.js to v1.6.1.