From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 3 Dec 2013 16:27:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~96^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f7ed6e816b00fabaf57d2946638a988a3043c3f5;p=myslice.git

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

f7ed6e816b00fabaf57d2946638a988a3043c3f5