Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 1 Jul 2015 07:13:53 +0000 (09:13 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 1 Jul 2015 07:13:53 +0000 (09:13 +0200)

Trivial merge