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

author Margaux Clerc <margaux.clerc@belledonne-communications>

Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)

committer Margaux Clerc <margaux.clerc@belledonne-communications>

Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
author Margaux Clerc <margaux.clerc@belledonne-communications>
Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
committer Margaux Clerc <margaux.clerc@belledonne-communications>
Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
diff --cc gtk/main.c
Simple merge
diff --cc gtk/parameters.ui
Simple merge
author	Margaux Clerc <margaux.clerc@belledonne-communications>
	Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
committer	Margaux Clerc <margaux.clerc@belledonne-communications>
	Fri, 14 Dec 2012 15:36:15 +0000 (16:36 +0100)
		1	2
gtk/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/parameters.ui	patch \|	diff1 \|	diff2 \|	blob \| history