From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 5 Sep 2013 15:24:12 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~10
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=4b6b013580973461964d6a2f3ed66636ac5e7dbc

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

4b6b013580973461964d6a2f3ed66636ac5e7dbc