Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 27 Mar 2014 10:34:11 +0000 (11:34 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 27 Mar 2014 10:34:11 +0000 (11:34 +0100)

Trivial merge