Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 24 Feb 2014 11:32:30 +0000 (12:32 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 24 Feb 2014 11:32:30 +0000 (12:32 +0100)

Trivial merge