Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 09:25:38 +0000 (11:25 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 09:25:38 +0000 (11:25 +0200)
commita0828c4ed067e530b4f4f6ecdfbf88c0936bb4be
tree0fbb5f585a25647d49e779e283684d46629dde65
parentc314ba77f0839a1a99d92af6987c71aa5c1459fb
parentb932fc56d413781f414819c67ade7e69b707d1fb
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab