Merge branch 'master' of git://git.onelab.eu/sfa
authorLoic Baron <loic.baron@lip6.fr>
Fri, 9 Feb 2018 16:39:16 +0000 (17:39 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 9 Feb 2018 16:39:16 +0000 (17:39 +0100)

Trivial merge