Merge branch 'dev_bt_session_version'

diff --cc coreapi/callbacks.c
index 1f7ff42fd19636c1c02678b74f7bc70e0cdaca41,032218a2ef561ac320c6dd803b4e64a913729ecc..7985f36588295d2f4d5ea4cd8e974f60a2899f3c
--- 1/coreapi/callbacks.c
--- 2/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@@ -344,7 -344,8 +344,8 @@@ static void call_accepted(SalOp *op)
                linphone_call_set_state(call,LinphoneCallConnected,"Connected");
                if (call->referer) linphone_core_notify_refer_state(lc,call->referer,call);
        }
 -      if (md && !sal_media_description_empty(md)){
 +      if (md && !sal_media_description_empty(md) && !linphone_core_incompatible_security(lc,md)){
+               linphone_call_update_remote_session_id_and_ver(call);
                if (sal_media_description_has_dir(md,SalStreamSendOnly) ||
                    sal_media_description_has_dir(md,SalStreamInactive)){
                        if (lc->vtable.display_status){

diff --cc coreapi/linphonecall.c
Simple merge

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/private.h
Simple merge