Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Nov 2014 17:31:26 +0000 (18:31 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Nov 2014 17:31:26 +0000 (18:31 +0100)
commit942e4d7597ac78a506cca5b62c1832dbaae8a72e
tree7e59bedded5dfc38c2071780f9d1d23c39a3984a
parent3f6050795df56316cf187e90390661f1d6b0fc60
parent05fdb96b6ee2e43b62cd4406a1f52485696d1367
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab