Merge commit 'aab6c70'

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

Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)

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

Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)
author Jehan Monnier <jehan.monnier@linphone.org>
Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)
committer Jehan Monnier <jehan.monnier@linphone.org>
Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)
diff --cc coreapi/callbacks.c
Simple merge
diff --cc coreapi/linphonecall.c
Simple merge
diff --cc coreapi/sal.h
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Tue, 3 Apr 2012 08:50:48 +0000 (10:50 +0200)
		1	2
coreapi/callbacks.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecall.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/sal.h	patch \|	diff1 \|	diff2 \|	blob \| history