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

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

ea4c18569ab7d0ab9f5a5ca94a9f8a9ce4c9b28d