Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 9 Feb 2016 17:44:01 +0000 (18:44 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 9 Feb 2016 17:44:01 +0000 (18:44 +0100)
commitdd127061b8eb30408c2a29048eef766de29b178d
treeee7aaa65ab42e471620a3fdcad9da8bc957315ac
parent89af8babd28a7da90ffe59be3ce7b7e812734cd0
parentf24cdcc04c338e5d7bb4abd6e204930fc7d148dc
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab