Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 19 Jun 2015 12:36:57 +0000 (14:36 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 19 Jun 2015 12:36:57 +0000 (14:36 +0200)

Trivial merge