From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 21 Jul 2014 13:25:19 +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=fdd9b516fcb287a9451874c04fd946bef9803c13;p=myslice.git

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

fdd9b516fcb287a9451874c04fd946bef9803c13