Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 6 Mar 2014 14:58:26 +0000 (15:58 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 6 Mar 2014 14:58:26 +0000 (15:58 +0100)
commita5361a5bcf8457eea5f25fed266db99a5fa7ac88
tree55cb4bd59ad67fb6fd139c7bc7f057684a540d28
parent97ca46051fe80b3cbd6978d558901c675d787d76
parent6c58824ede12bb0b6f7025e5bee6ec91bd921243
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab