From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 23 Aug 2013 14:21:12 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~44
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=cd06fa4f83e017abe561dafcfea0c07b9e1beda3

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

cd06fa4f83e017abe561dafcfea0c07b9e1beda3