From: javier <javier.garcial.external@atos.net>
Date: Tue, 17 Jun 2014 16:35:13 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~64^2~10
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=9866f36e4ffc2e84247c756cd3869518d8e423d7

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

9866f36e4ffc2e84247c756cd3869518d8e423d7