Merge branch 'master' into qt-client

AUTHORS

sflphone-client-gnome/VERSION

sflphone-client-gnome/configure.ac

sflphone-client-gnome/man/Makefile.am

sflphone-client-gnome/sflphone.desktop.in

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/accountlist.c

sflphone-client-gnome/src/accountlist.h

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/actions.h

sflphone-client-gnome/src/assistant.c

sflphone-client-gnome/src/call.c

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

sflphone-client-gnome/src/config/accountwindow.h

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

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

sflphone-client-gnome/src/config/hooks-config.h

sflphone-client-gnome/src/contacts/calllist.h

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

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