Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 11 Feb 2016 14:29:13 +0000 (15:29 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 11 Feb 2016 14:29:13 +0000 (15:29 +0100)

Trivial merge