Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Tue, 22 Jul 2014 17:09:01 +0000 (14:09 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 22 Jul 2014 17:09:01 +0000 (14:09 -0300)

Trivial merge