Merge pull request #89 from joakim/master

Fix msgpack import

nomadnet/Conversation.py

@@ -2,7 +2,7 @@ import os
 import RNS
 import LXMF
 import shutil
-import msgpack
+import RNS.vendor.umsgpack as msgpack
 import nomadnet
 from nomadnet.Directory import DirectoryEntry
 
@@ -903,4 +903,4 @@ class ConversationMessage:
             with open(index_path, "wb") as f:
                 f.write(msgpack.packb(index))
         except Exception as e:
-            RNS.log("Error writing conversation index: "+str(e), RNS.LOG_ERROR)
+            RNS.log("Error writing conversation index: "+str(e), RNS.LOG_ERROR)