Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:31 +0000 (13:13 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:31 +0000 (13:13 -0300)

Trivial merge