Merge branch 'master' of belledonne-communications.com:linphone-private

Conflicts:
	coreapi/linphonecore.h

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
index 4561250a035a86eba2a77041cfe710b1d71c7b28,54c915060f0fcfdd69dc552cbb356fc316f1cc7d..6c8f0e208eb8caed1a2c97c4a63daf8cb4c7ca38
--- 1/coreapi/linphonecore.h
--- 2/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@@ -661,7 -661,7 +661,8 @@@ typedef struct _LinphoneCor
         * In case of false, network state must be communicate to linphone core with method linphone_core_
         */
        bool_t auto_net_state_mon;
+       bool_t network_reachable;
 +      int down_ptime;
  } LinphoneCore;