Merge branch 'master' of ssh://git.popipo.fr/var/lib/git/gps