Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-common/src/Makefile.am

sflphone-common/src/accountcreator.cpp

sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp

sflphone-common/src/audio/codecs/audiocodecfactory.h

sflphone-common/src/config/config.cpp

sflphone-common/src/config/config.h

sflphone-common/src/dbus/configurationmanager.cpp

sflphone-common/src/global.h

sflphone-common/src/history/historymanager.h

sflphone-common/src/iax/iaxaccount.cpp

sflphone-common/src/iax/iaxvoiplink.cpp

sflphone-common/src/main.cpp

sflphone-common/src/managerimpl.cpp

sflphone-common/src/managerimpl_registration.cpp

sflphone-common/src/preferences.cpp

sflphone-common/src/preferences.h

sflphone-common/src/sip/sipaccount.cpp

sflphone-common/src/user_cfg.h

sflphone-common/src/voiplink.cpp