From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 25 Feb 2014 14:47:38 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~313
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e7e5fab0d3b5e0cee66323fda53539bfdbb3eabd;p=myslice.git

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

e7e5fab0d3b5e0cee66323fda53539bfdbb3eabd