From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 29 Jul 2013 15:15:19 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~86
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d9fa97447cdfd1fc896d840f7b3bebbb3d2bd921

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

d9fa97447cdfd1fc896d840f7b3bebbb3d2bd921