From: Margaux Clerc <margaux.clerc@belledonne-communications>
Date: Fri, 14 Dec 2012 15:36:15 +0000 (+0100)
Subject: Merge branch 'master' of git.linphone.org:linphone into dev_gtk_new_ui
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=beb2d66e21d2b939e221f8ae2043ab8dfec97681

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

Conflicts:
	gtk/parameters.ui
---

beb2d66e21d2b939e221f8ae2043ab8dfec97681