Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 14 Aug 2014 17:39:59 +0000 (19:39 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 14 Aug 2014 17:39:59 +0000 (19:39 +0200)
commit4f412c5d376e32ebace33044d493b59db70761c5
treebac7c29d625aa27be5ba661dd942da7be788c60c
parent2c1bd9325dc325f82d99807fcdb9d14ae148f167
parent5330bd9abbef397d72910d326df77fd45e34750f
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab