Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 15:35:43 +0000 (16:35 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 15:35:43 +0000 (16:35 +0100)
commit1e37cc80687cb0969dc77f83a8d94c8980efa5ba
tree417983388981f6e4b00e1b0291a9c07bcb89f8db
parent6db254fddd190f5fdbdf0343f031b3e329de22dd
parent1e9b1c8b9fdace4e4335bffec311d486c30afe34
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab