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

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

48759e302cac75bf63a1e156603c29e96b704b13