Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 19 Dec 2014 17:44:11 +0000 (18:44 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 19 Dec 2014 17:44:11 +0000 (18:44 +0100)
commite9333f7fee9c25950ed53df4d9fdbbe0dffb7f67
treed475e5531e72e778104dbf7d237e17ff7c61cbd6
parent3fba029cbc3f1a8ead9a3ba72c84d8808bc231ac
parenta2518feb50ac1ff43474e5f2cee2e91ba96cb5b5
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab