Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 16:34:04 +0000 (17:34 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 16:34:04 +0000 (17:34 +0100)
commitf0469660a3ed5dee4d279ec7fa801a57b44da79b
tree0be731767a78417733d982fa0acbde53f4fba478
parent47c3f761464a34d09a04cfdbb361bc5a944238ab
parent7049defc74c7aaea9f609aa538dded943dec5d35
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab