Merged, partially.

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
index b0d738d..309b11c 100644 (file)
--- a/turba/docs/CHANGES
+++ b/turba/docs/CHANGES
@@ -2,7 +2,6 @@
 v3.0-git
 --------
 
-[jan] Support X-ANNIVERSARY, X-CHILDREN, and X-SPOUSE vCard fields.
 [mjr] The listTimeObjects API now returns categories for each source
       individually instead of returning only the categories available
       (Request #8504).
@@ -11,6 +10,8 @@ v3.0-git
 v2.3.3-cvs
 ----------
 
+[jan] Support X-ANNIVERSARY, X-CHILDREN, and X-SPOUSE vCard fields
+      (Request #8074).
 [jan] Fix copying and moving of image fields (Ryu <ryu@ryux.org>, Bug #8523).
 [jan] Don't return an error on empty LDAP search results (Bug #8595).
 [jan] Replace PHP5-only code from the LDIF exporter (Bug #8586).