Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Sat, 4 Oct 2014 09:16:38 +0000 (11:16 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Sat, 4 Oct 2014 09:16:38 +0000 (11:16 +0200)

Trivial merge