From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 27 Feb 2014 16:02:24 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~271
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=550fb69fd118f544fb7eb7faa8345654af28a427;p=myslice.git

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

550fb69fd118f544fb7eb7faa8345654af28a427