Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 14 Apr 2014 09:36:49 +0000 (11:36 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 14 Apr 2014 09:36:49 +0000 (11:36 +0200)
commit021d2c7b46d4d6a216913539ce64f3acf3a36bc1
tree4416844a918e78d651e0179515e33c154bdcc5a2
parent2829eeb50eae87e3982f7c9a6fe9e91acdce7b2e
parent67c9e8a9f6fbb8d9dcce7f3d2611a99b4363ae99
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab