Merge branch 'master' into conference

.gitignore

sflphone-client-gnome/src/accountlist.h

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/codeclist.c

sflphone-client-gnome/src/codeclist.h

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

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

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-gnome/src/ui.xml

sflphone-client-gnome/src/uimanager.c

sflphone-client-gnome/src/uimanager.h

sflphone-common/libs/pjproject/Makefile

sflphone-common/src/sip/sipvoiplink.cpp

...d-system/launchpad/debian-sflphone-client-gnome/changelog

...uild-system/launchpad/debian-sflphone-client-gnome/compat

...ild-system/launchpad/debian-sflphone-client-gnome/control

...stem/launchpad/debian-sflphone-client-gnome/control.hardy

...m/launchpad/debian-sflphone-client-gnome/control.intrepid