From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 24 May 2013 08:19:40 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~122
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d0ac1170425c64337c521b673b88d75425b8adba

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

d0ac1170425c64337c521b673b88d75425b8adba