Merge branch 'master' into jbonjean

sflphone-client-gnome/src/config/accountconfigdialog.c

sflphone-client-gnome/src/config/audioconf.c

...-client-gnome/src/dbus/configurationmanager-introspec.xml

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-gnome/src/dbus/dbus.h

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-gnome/src/shortcuts.c

sflphone-client-gnome/src/statusicon.c

sflphone-common/src/account.cpp

sflphone-common/src/account.h

sflphone-common/src/dbus/configurationmanager-introspec.xml

sflphone-common/src/dbus/configurationmanager.cpp

sflphone-common/src/dbus/configurationmanager.h

sflphone-common/src/iax/iaxaccount.cpp

sflphone-common/src/iax/iaxvoiplink.cpp

sflphone-common/src/managerimpl.cpp

sflphone-common/src/managerimpl.h

sflphone-common/src/preferences.cpp

sflphone-common/src/preferences.h

sflphone-common/src/sip/sipaccount.cpp