Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

author Jehan Monnier <jehan.monnier@linphone.org>

Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)

committer Jehan Monnier <jehan.monnier@linphone.org>

Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)
author Jehan Monnier <jehan.monnier@linphone.org>
Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)
committer Jehan Monnier <jehan.monnier@linphone.org>
Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/sal_eXosip2.c
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Wed, 22 Jun 2011 18:29:51 +0000 (20:29 +0200)
		1	2
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	patch \|	diff1 \|	diff2 \|	blob \| history