From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 2 Apr 2014 10:19:04 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~151^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4fc97ad3d1638026464196b113229376d35656f;p=myslice.git

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

c4fc97ad3d1638026464196b113229376d35656f