Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 15 Jul 2014 16:08:59 +0000 (18:08 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 15 Jul 2014 16:08:59 +0000 (18:08 +0200)
commit4bec211b6b6a2f67c7dedc5351d65e5e5810ca7f
tree1eeb9d5885126c545814c75eebb3828c2cd24546
parent48e00b353a2b34629914232082af547b6a2a9d1e
parent70677caff8e3b3c5e8caa255f01ca1a7ec864034
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab