Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 24 Apr 2015 12:13:22 +0000 (14:13 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 24 Apr 2015 12:13:22 +0000 (14:13 +0200)
commit27f14e5df3e0a53230cf6a959121cbb3f6bc3e43
tree612b3c8e8d19dc1c28a1d309bed99dd9f4ce7810
parent9923754657b1e28fab15ac658f500f4c6b90b751
parent6f6374f374c82d146766a656788f3b34a20cf343
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab