From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 31 Jul 2014 10:55:54 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~33
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=b120b048f0b1f069b13b36c884f5e2915ff15254

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

b120b048f0b1f069b13b36c884f5e2915ff15254