Sandrine Avakian 825165d144 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory ... # Conflicts: # mediastreamer2		2016-02-01 10:58:37 +01:00
..
sal.h	Merge branch 'master' of git.linphone.org:linphone into dev_msfactory	2016-02-01 10:58:37 +01:00