From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 13 Aug 2013 09:43:07 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~59
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=71188a9ad677af8150780c40ce51936b06e18b9c

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

71188a9ad677af8150780c40ce51936b06e18b9c