From: javier <javier.garcial.external@atos.net>
Date: Mon, 16 Jun 2014 15:57:00 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~64^2~14
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=38810dd05146ff653815d1a98f56ef0c020555e2

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

38810dd05146ff653815d1a98f56ef0c020555e2