Merge branch 'master' of gitosis@git.savoirfairelinux.com:sflphone-android.git