From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 28 Feb 2014 18:50:50 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~259^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c48236d2102eaabd62a346cf792430c340821d3e;p=myslice.git

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

c48236d2102eaabd62a346cf792430c340821d3e