From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 15 Jul 2014 13:46:46 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~57^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=af5885eb6b24505d4979de9d580a1e13e297bde8;p=myslice.git

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

af5885eb6b24505d4979de9d580a1e13e297bde8