Merge branch 'm_savard' of...

Merge branch 'm_savard' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone into m_savard

Conflicts:
	sflphone-common/src/sip/sipvoiplink.cpp