Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 23 Nov 2015 17:21:13 +0000 (18:21 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 23 Nov 2015 17:21:13 +0000 (18:21 +0100)

Trivial merge