From: Jordan Augé <jordan.auge@lip6.fr>
Date: Mon, 29 Jul 2013 03:42:55 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~86^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c0c7175e6883ad9bc746692e7c71202e64ec2351

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

c0c7175e6883ad9bc746692e7c71202e64ec2351