From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 2 Aug 2013 08:07:56 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~83^2~6
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=302dd5bda1297ed6579ca26da35ee67f8d35d934

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

302dd5bda1297ed6579ca26da35ee67f8d35d934