Merge branch 'master' of ssh://git.popipo.fr/var/lib/git/gps
authorBenoit Papillault <benoit.papillault@luceor.com>
Tue, 19 Dec 2017 22:54:10 +0000 (23:54 +0100)
committerBenoit Papillault <benoit.papillault@luceor.com>
Tue, 19 Dec 2017 22:54:10 +0000 (23:54 +0100)

Trivial merge