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

Trivial merge