From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 24 Jul 2014 15:35:53 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~47
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=f0189aa63439eab37be9b04cb728d17c3c867f71

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

f0189aa63439eab37be9b04cb728d17c3c867f71