Merge branch 'master' of git.linphone.org:linphone into upnp

Conflicts:
	coreapi/linphonecore.c
	mediastreamer2

diff --cc configure.ac
Simple merge

diff --cc coreapi/callbacks.c
Simple merge

diff --cc coreapi/linphonecall.c
Simple merge

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/misc.c
Simple merge

diff --cc coreapi/private.h
index c9d77145035ceb0cf58d4bfa0b1f625330af00bd,c171fac883d9382a73cab429327787fbf4b2e8d4..91b0b32c05833a6f4777e6c984d43ab6fa2fc25c
--- 1/coreapi/private.h
--- 2/coreapi/private.h
+++ b/coreapi/private.h
@@@ -292,8 -284,8 +292,9 @@@ void linphone_call_stop_audio_stream(Li
  void linphone_call_stop_video_stream(LinphoneCall *call);
  void linphone_call_stop_media_streams(LinphoneCall *call);
  void linphone_call_delete_ice_session(LinphoneCall *call);
 +void linphone_call_delete_upnp_session(LinphoneCall *call);
  void linphone_call_stop_media_streams_for_ice_gathering(LinphoneCall *call);
+ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescription *old_md, SalMediaDescription *new_md);
  
  const char * linphone_core_get_identity(LinphoneCore *lc);
  const char * linphone_core_get_route(LinphoneCore *lc);

diff --cc coreapi/proxy.c
Simple merge

diff --cc gtk/Makefile.am
Simple merge

diff --cc gtk/parameters.ui
Simple merge

diff --cc gtk/propertybox.c
Simple merge

diff --cc mediastreamer2
index 07ca1256c7dc9ea15831d7f348b4104ccef162d3,3ad9baedfa381bc4244560cc8307c920adc5aec4..b8dffb2741223e13baa4c9d1514a1911d070b0e7
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 07ca1256c7dc9ea15831d7f348b4104ccef162d3
 -Subproject commit 3ad9baedfa381bc4244560cc8307c920adc5aec4
++Subproject commit b8dffb2741223e13baa4c9d1514a1911d070b0e7