From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 16 Jun 2014 15:45:18 +0000 (-0500)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~64^2~14^2~1
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=505a38cbeb3714eb8d2b54c55c1310a890ebdbd7

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

505a38cbeb3714eb8d2b54c55c1310a890ebdbd7