Merge branch 'codecs-per-account' of...

Merge branch 'codecs-per-account' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

Conflicts:
	sflphone-client-gnome/src/config/audioconf.c
	sflphone-client-gnome/src/config/preferencesdialog.c
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp