Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Sep 2018 12:33:39 +0000 (14:33 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Sep 2018 12:33:39 +0000 (14:33 +0200)

Trivial merge