From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 25 Oct 2013 16:01:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~6^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=0c8a634162f3271018102e75a3934c5db5e48f59

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

0c8a634162f3271018102e75a3934c5db5e48f59