From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 17 Dec 2014 16:21:33 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fce3531291a0c584c0ed6c93dcc135469ce3fa9d

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

fce3531291a0c584c0ed6c93dcc135469ce3fa9d