Merge branch 'master' of git://git.onelab.eu/sfa
authorLoic Baron <loic.baron@lip6.fr>
Fri, 18 May 2018 10:22:47 +0000 (12:22 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 18 May 2018 10:22:47 +0000 (12:22 +0200)

Trivial merge