From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 9 Jul 2014 11:56:04 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~30
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee9ed4a2d0300eeb7557ef94d70a7195962ea8ab;hp=-c;p=unfold.git

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

ee9ed4a2d0300eeb7557ef94d70a7195962ea8ab