Merge branch 'master' of...

sflphone-client-gnome/src/actions.c

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

sflphone-client-gnome/src/contacts/addressbook.c

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

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/statusicon.c

sflphone-client-gnome/src/uimanager.c

...bs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h

...n/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c

sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c

sflphone-common/src/sip/sipvoiplink.cpp

tools/pysflphone/pysflphone_testdbus.py

tools/pysflphone/sflphonectrlsimple.py