From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 9 Aug 2013 11:31:30 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~62
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=47fd4e2abb3c63765efec28fc9ea8b73264aa5af

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

47fd4e2abb3c63765efec28fc9ea8b73264aa5af