From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Feb 2014 18:21:03 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~261
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=eefb371bb305430abf4cb867ed323759a7ad8535

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

eefb371bb305430abf4cb867ed323759a7ad8535