From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 18 Oct 2013 15:42:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9b5bc9a851083b209d3296a7cae0fb67d05763b6;p=myslice.git

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

9b5bc9a851083b209d3296a7cae0fb67d05763b6