From dd0008f6ab9d05df5f3a743357a6e2567bdeae01 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 12 Jun 2012 14:42:52 +0000
Subject: [PATCH 1/2] Fixed version

Monotone-Parent: ea6bc80cdabf55c83e6df32dd1aaa4ecfa16a6e1
Monotone-Revision: 8d523fe7796cff9d335706a89105b900379bfa52

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-12T14:42:52
Monotone-Branch: ca.inverse.sogo
---
 Version | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Version b/Version
index 0de612ba1..09503ebca 100644
--- a/Version
+++ b/Version
@@ -2,6 +2,6 @@
 # This file is included by library makefiles to set the version information
 # of the executable.
 
-MAJOR_VERSION=1
-MINOR_VERSION=3
-SUBMINOR_VERSION=17
+MAJOR_VERSION=2
+MINOR_VERSION=0
+SUBMINOR_VERSION=0

From 07cc5e8cf8f66a5ce0ad7d3b3fba676b9dac79c9 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 15 Jun 2012 13:33:21 +0000
Subject: [PATCH 2/2] Monotone-Parent: 8d523fe7796cff9d335706a89105b900379bfa52
 Monotone-Revision: b664e2e19975c70a7614aa975a3a045f0bec7ec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-15T13:33:21
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/MAPIStoreContext.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 17907e93b..1817658ea 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -294,9 +294,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
               [MAPIStoreUserContext userContextWithUsername: username
                                              andTDBIndexing: indexingTdb]);
 
+#if 0
       mapistore_mgmt_backend_register_user (newConnInfo,
                                             "SOGo",
                                             [username UTF8String]);
+#endif
 
       connInfo = newConnInfo;
       username = [NSString stringWithUTF8String: newConnInfo->username];
@@ -315,9 +317,12 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 
 - (void) dealloc
 {
+#if 0
   mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo", 
                                           [[userContext username]
                                             UTF8String]);
+#endif
+
   [contextUrl release];
   [userContext release];
   [containersBag release];