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

Trivial merge