From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 21 Aug 2013 12:51:36 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~50
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ac2dda758798f7e44de062d370763c639cc6a375

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

ac2dda758798f7e44de062d370763c639cc6a375