From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 6 Aug 2013 15:36:39 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~75
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=05861f44a20edf11bacba3d0d6fad3dee9ad7957

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

05861f44a20edf11bacba3d0d6fad3dee9ad7957