Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Thu, 5 Jun 2014 13:52:54 +0000 (08:52 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Thu, 5 Jun 2014 13:52:54 +0000 (08:52 -0500)
commit51b38081d2a5dca8a2760e6b195f4f53bbec1366
tree317f107a70f7994553281ac0e9d63e7fe137e26a
parent4b11052d4dc092c03d6a80af4c01485acc2ecc6f
parent8b147c2787afcd2a94a71e2d2b1e57a7bc78ed64
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab