From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 25 Mar 2014 17:02:00 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~176
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ac3dbfec87815247c7bfbf438ff266f6ef25d27b;p=myslice.git

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

ac3dbfec87815247c7bfbf438ff266f6ef25d27b