# HG changeset patch
# User Nikita Kozlov <nikita@mbdsys.com>
# Date 1292238836 -3600
# Node ID 75ed181c8960ebe7d832c92f79587c66fa61e64b
# Parent  5123895ac95ffeb5a1f2f8d5af49bcea0f5b61ce
merge

diff -r 5123895ac95f -r 75ed181c8960 src/com/beem/project/beem/otr/BeemOtrManager.java
--- a/src/com/beem/project/beem/otr/BeemOtrManager.java	Sun Dec 12 22:24:43 2010 +0100
+++ b/src/com/beem/project/beem/otr/BeemOtrManager.java	Mon Dec 13 12:13:56 2010 +0100
@@ -31,6 +31,7 @@
     private static final OtrPolicy mGlobalPolicy = new OtrPolicyImpl(OtrPolicy.ALLOW_V2 | OtrPolicy.ERROR_START_AKE);
 
 
+
     private Map<SessionID, KeyPair> mKeys = new HashMap<SessionID, KeyPair>();
 
     public OtrEngine getOtrManager() {
diff -r 5123895ac95f -r 75ed181c8960 src/com/beem/project/beem/service/ChatAdapter.java
--- a/src/com/beem/project/beem/service/ChatAdapter.java	Sun Dec 12 22:24:43 2010 +0100
+++ b/src/com/beem/project/beem/service/ChatAdapter.java	Mon Dec 13 12:13:56 2010 +0100
@@ -299,6 +299,8 @@
 	    }
 	    mRemoteListeners.finishBroadcast();		
 	}
+    }
+
     @Override
     public void startOtrSession() throws RemoteException {
 	if (mOtrSessionId != null)