From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 21 Aug 2013 13:05:56 +0000 (+0200)
Subject: Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
X-Git-Tag: myslice-0.2-1~41^2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4c08a58e3d791fd16c37d579569c73db3378849a;p=myslice.git

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

4c08a58e3d791fd16c37d579569c73db3378849a