From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 24 Jul 2014 21:12:21 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~45^2^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=87d78646979a54137f613f94b080014af7ab8f66

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

87d78646979a54137f613f94b080014af7ab8f66