From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 6 May 2014 14:27:24 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~121
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5ed0a2e28c3614767633a3361544949a303b91f9

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

5ed0a2e28c3614767633a3361544949a303b91f9