Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Sat, 1 Mar 2014 13:50:14 +0000 (14:50 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Sat, 1 Mar 2014 13:50:14 +0000 (14:50 +0100)
commit88c06912c40136d405916eee802da3b984f881e5
tree3eaaf82515dbf8ee26a466b9677412a46cb6e0dd
parent566ca3fdb6a8d05f3da5703e5d1abe60c2ad1820
parent2f18748b06b7c17204b0bb529f23266a110bf041
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab