From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 30 Jun 2014 13:16:32 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~60^2~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c92bdf384d06da6780b776652e94ce5afed75127;p=myslice.git

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

c92bdf384d06da6780b776652e94ce5afed75127