Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 18 Apr 2016 09:16:40 +0000 (11:16 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 18 Apr 2016 09:16:40 +0000 (11:16 +0200)

Trivial merge