Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 16:59:31 +0000 (18:59 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 16:59:31 +0000 (18:59 +0200)

Trivial merge