From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 5 Jun 2014 13:09:54 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~77^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=a968cf61c4c7bc122108fb37fac8cdc111f466e6

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

a968cf61c4c7bc122108fb37fac8cdc111f466e6