From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 29 Sep 2014 09:53:31 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1^2~21^2~7
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=25a564caae591fd408aa0c11470e99852306f20d

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

25a564caae591fd408aa0c11470e99852306f20d