From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 29 Jul 2014 12:52:59 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~35^2^2
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=a7e39005063e624c4d12122beb052ff1fa2890cb

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

a7e39005063e624c4d12122beb052ff1fa2890cb