From: Javier García <javier.garcial.external@atos.net>
Date: Mon, 1 Dec 2014 12:09:54 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~26
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=3b39e97b04f9333fd58978120f00c1b4ffffbc41

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

3b39e97b04f9333fd58978120f00c1b4ffffbc41