Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 21 Apr 2015 09:52:35 +0000 (11:52 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 21 Apr 2015 09:52:35 +0000 (11:52 +0200)

Trivial merge