From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 5 Jun 2014 10:46:53 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~77^2~6
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=77076ce88a9b60ad7b64427e90ad6ecaef7c948e

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

77076ce88a9b60ad7b64427e90ad6ecaef7c948e