Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Wed, 4 Jun 2014 22:03:58 +0000 (17:03 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Wed, 4 Jun 2014 22:03:58 +0000 (17:03 -0500)
commitc3c38ca2ec7e6bffb3cf70897a190729a05d16a1
tree60ce6f0ba44a7020652e43aea96e61387d6d3944
parenta1f72f680d4745eb0352b499819ac4672deceb66
parent895735ab33d121bf9cea8e6fadaa3ac94de1b33e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab