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