Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 22 Apr 2015 17:35:19 +0000 (19:35 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 22 Apr 2015 17:35:19 +0000 (19:35 +0200)
commit3efb1dc5f502a25a4e1ebe2e499eba3d7a94e127
tree34b4c61587641288c61fd93a6bff3b4eb9f4931c
parent10fd8a07446a256af70c2da34e8bac7965999cb8
parent7db03972cd9a884442c9e468cfcadc564ed9b9a7
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab