From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Nov 2014 17:31:26 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~5
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=942e4d7597ac78a506cca5b62c1832dbaae8a72e

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

942e4d7597ac78a506cca5b62c1832dbaae8a72e