Yann Diorcet 8dd4ee3ee2 Merge branch 'master' into belle-sip ... Conflicts: build/android/common.mk coreapi/linphonecore.h		2013-03-12 13:30:13 +01:00
..
sal.h	Merge branch 'master' into belle-sip	2013-03-12 13:30:13 +01:00