Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
	coreapi/Makefile.am
	coreapi/linphonecore.c
	mediastreamer2

diff --cc configure.ac
index 77251262df3e410db16bddf75dad51ae9e7c7066,5fe32ef33749bfb48803e49b16cae3162c9b43a9..298c7986d10928545df5c3eb36833ecce3e7e4ae
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -41,8 -41,10 +41,10 @@@ AC_C_INLIN
  AM_PROG_CC_STDC
  AC_HEADER_STDC
  AM_PROG_CC_C_O
+ AC_CHECK_PROGS(MD5SUM,[md5sum md5])
+ AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM)
  
 -case $target_os in
 +case $target in
        *mingw32ce)
                CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
                CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"

diff --cc coreapi/Makefile.am
Simple merge

diff --cc coreapi/help/Makefile.am
index 7f8ea0aa76160663cb77c270e5900e01cf6858b4,6690fd4a6379842cb90d456afd77afdccf3cd940..a68ab2f19c7cfe0b28d899ad56b42a31ff7bb3bc
--- 1/coreapi/help/Makefile.am
--- 2/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@@ -32,8 -32,9 +32,9 @@@ endi
  clean-local:
        rm -rf doc
  
+ if ENABLE_TESTS
  #tutorials
 -
 +if BUILD_TESTS
  noinst_PROGRAMS=helloworld registration buddy_status chatroom
  
  helloworld_SOURCES=helloworld.c
@@@ -57,8 -58,9 +58,9 @@@ chatroom_SOURCES=chatroom.
  LINPHONE_TUTOS+=$(chatroom_SOURCES)
  
  chatroom_LDADD=$(helloworld_LDADD)
+ endif
                                                                                                
 -                              
 +endif                 
  
  INCLUDES=-I$(top_srcdir)/coreapi \
                $(MEDIASTREAMER_CFLAGS)

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc mediastreamer2
index 96417301a643aedd56a7760f0036415ee5d2aa45,a82dcdbf8a4e8364bdcaa6f6fb88ca087f48a780..021c5cd8cca603c6e905ec6688a4deefa995358c
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96417301a643aedd56a7760f0036415ee5d2aa45
 -Subproject commit a82dcdbf8a4e8364bdcaa6f6fb88ca087f48a780
++Subproject commit 021c5cd8cca603c6e905ec6688a4deefa995358c