BFN

Conflicts:
	turba/docs/CHANGES
	turba/package.xml

turba/docs/CHANGES

@@ -9,6 +9,28 @@ v4.3.0-git
 [jan] Support multi-value RDNs in LDAP DN attributes (horde@iotti.biz, Request
       #11889).
 
+------
+v4.2.6
+------
+
+[mjr] Fix adding tags to new contacts (Bug #13884).
+[jan] Fix waiting for replication on LDAP backend.
+
+
+------
+v4.2.5
+------
+
+[jan] Fix export format of tags to vCard 3.0 categories (Bug #13800).
+
+
+------
+v4.2.4
+------
+
+[jan] Use the SHOW permission to determine the sidebar address book list.
+>>>>>>> 957bc2d... BFN
+
 
 ------
 v4.2.3

turba/package.xml

@@ -1943,6 +1943,46 @@
 * [mjr] Fix broken EAS synchronization due to incorrect setting of the Categories field.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>4.2.4</release>
+    <api>4.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-12-03</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [jan] Use the SHOW permission to determine the sidebar address book list.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>4.2.5</release>
+    <api>4.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2015-02-10</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [jan] Fix export format of tags to vCard 3.0 categories (Bug #13800).
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>4.2.6</release>
+    <api>4.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2015-02-10</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [mjr] Fix adding tags to new contacts (Bug #13884).
+* [jan] Fix waiting for replication on LDAP backend.
+   </notes>
+  </release>
   <release>
    <date>2014-06-04</date>
    <version>