Merge branch 'master' of git.linphone.org:linphone into dev_edge_optim

author Simon Morlat <simon.morlat@linphone.org>

Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)

committer Simon Morlat <simon.morlat@linphone.org>

Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)
author Simon Morlat <simon.morlat@linphone.org>
Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)
committer Simon Morlat <simon.morlat@linphone.org>
Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)
diff --cc coreapi/linphonecall.c
Simple merge
diff --cc coreapi/misc.c
Simple merge
diff --cc coreapi/private.h
Simple merge
author	Simon Morlat <simon.morlat@linphone.org>
	Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Tue, 4 Sep 2012 13:50:23 +0000 (15:50 +0200)
		1	2
coreapi/linphonecall.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	patch \|	diff1 \|	diff2 \|	blob \| history