From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 2 Aug 2013 15:49:35 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~83
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2b1ae67a6922ed97c96d22dc78090a8aea2c3a4d

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

2b1ae67a6922ed97c96d22dc78090a8aea2c3a4d