Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 27 Mar 2014 18:34:01 +0000 (19:34 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 27 Mar 2014 18:34:01 +0000 (19:34 +0100)
commitc433e530158ddb73ef1f61413287be60b9dde278
tree6fc22537fc7a0fe27b654c74bcd72646cb2a24fc
parent474b66769abb3ba8e7c5d6b927fddcaefc86632f
parent3e265e5ad435c17fff8579d7f672d5d478c0643c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab