From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 25 Jul 2013 14:16:22 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~90
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=7b1bc5bd58de4f06a193f3dd344df7b342504cbf

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

7b1bc5bd58de4f06a193f3dd344df7b342504cbf