Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master

Conflicts:
	core/Messenger.c

1 files changed, 4 insertions, 0 deletions

diff --git a/core/Messenger.h b/core/Messenger.h
index 3a9a56df..3044122b 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -201,6 +201,10 @@ void m_callback_userstatus(void (*function)(int, USERSTATUS));
     in that case, you should discard it. */
 void m_callback_read_receipt(void (*function)(int, uint32_t));
 
+/* set the callback for friend status changes
+    function(int friendnumber, uint8_t status) */
+void m_callback_friendstatus(void (*function)(int, uint8_t));
+
 /* run this at startup
     returns 0 if no connection problems
     returns -1 if there are problems */