Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 4 Dec 2015 09:53:49 +0000 (10:53 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 4 Dec 2015 09:53:49 +0000 (10:53 +0100)
commitf9f854b970a22793c6fd2ede625f3891f05fd128
tree64118ebf6de81439ce40d8d41273c84bc6675bd2
parent59d17639bc6a96298bb12249ea3c9b09a298dc0b
parent2d7cf76d844a407ac8bcd79db301883fea5b60b7
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab