From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 23 Jul 2014 16:13:31 +0000 (-0300)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6bb00b8c26df5511beeaa54a33d2b6cce01f5807;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
---

6bb00b8c26df5511beeaa54a33d2b6cce01f5807