Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 9 Feb 2016 17:44:01 +0000 (18:44 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 9 Feb 2016 17:44:01 +0000 (18:44 +0100)

Trivial merge