Merge branch 'master' into dev_ice

author Ghislain MARY <ghislain.mary@belledonne-communications.com>

Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)

committer Ghislain MARY <ghislain.mary@belledonne-communications.com>

Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)
author Ghislain MARY <ghislain.mary@belledonne-communications.com>
Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)
committer Ghislain MARY <ghislain.mary@belledonne-communications.com>
Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)
diff --cc coreapi/linphonecall.c
Simple merge
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
diff --cc coreapi/misc.c
Simple merge
diff --cc coreapi/private.h
Simple merge
author	Ghislain MARY <ghislain.mary@belledonne-communications.com>
	Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)
committer	Ghislain MARY <ghislain.mary@belledonne-communications.com>
	Fri, 10 Aug 2012 11:21:45 +0000 (13:21 +0200)
		1	2
coreapi/linphonecall.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	patch \|	diff1 \|	diff2 \|	blob \| history