From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 4 Jul 2014 12:12:55 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~60^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=253c554d08ef543f56fa75dc2a20ccdd6f38e698;p=myslice.git

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

253c554d08ef543f56fa75dc2a20ccdd6f38e698