From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 6 Jan 2015 14:31:00 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~126
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2b14f57d4e4dba4eed8e1a495194b85bd84b1915;p=myslice.git

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

2b14f57d4e4dba4eed8e1a495194b85bd84b1915