BFN

Conflicts:
	framework/ActiveSync/package.xml

framework/ActiveSync/package.xml

@@ -12,17 +12,16 @@
  </lead>
  <date>2013-12-12</date>
  <version>
-  <release>2.9.2</release>
-  <api>2.9.0</api>
+  <release>2.10.0</release>
+  <api>2.10.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* [mjr] Fix typo that was causing server side searching of mailboxes to fail (Bug #12882).
-* [mjr] Add workaround for inconsistent handling of POOMCONTACTS date fields that causes fields like birthdays to become offset.
+* [mjr] Fix issue that causes sync to break when SMS messages are deleted on the client (Bug #12887).
 * [mjr] Add support for parsing TNEF data when possible (Bug #12882).
  </notes>
  <contents>
@@ -1849,14 +1848,15 @@
   </release>
   <release>
    <version>
-    <release>2.9.3</release>
-    <api>2.9.0</api></version>
+    <release>2.10.0</release>
+    <api>2.10.0</api></version>
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
    <date>2013-12-17</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mjr] Fix issue that causes sync to break when SMS messages are deleted on the client (Bug #12887).
 * [mjr] Add support for parsing TNEF data when possible (Bug #12882).
    </notes>
   </release>