From: Yasin Rahman <yasin.upmc@gmail.com>
Date: Thu, 21 May 2015 13:57:44 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.5~31
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=1437dc2df82ff903afe24ac4505db91f65045a97

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

1437dc2df82ff903afe24ac4505db91f65045a97