From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 3 Jul 2013 08:38:15 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~113
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=81969a7eda1f53797b579d0bd6a71e96c26e610b

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

81969a7eda1f53797b579d0bd6a71e96c26e610b