From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Mar 2014 18:38:19 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~161^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=75fe47c33c066bdac49d2dc2315aec57309c3cdb;p=myslice.git

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

75fe47c33c066bdac49d2dc2315aec57309c3cdb