Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 16:59:31 +0000 (18:59 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 16:59:31 +0000 (18:59 +0200)
commit58c5ad9dac78de73fe8762541ebf36a7ce00b409
treef787f86ad1e2f0ab5367b97476c9c15a14d2962c
parent6dcca4d4a7f11dff9962a1a3fc14ea1969e334f2
parent3299a047a1c9d2f260947404e672e3df6147f4b5
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab