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

Trivial merge