From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 26 Sep 2013 10:05:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~85^2~7^2^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2b1211c766c56a7b962d8b82c8f638825b6166cb

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

2b1211c766c56a7b962d8b82c8f638825b6166cb