Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 5 Dec 2014 18:20:49 +0000 (19:20 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 5 Dec 2014 18:20:49 +0000 (19:20 +0100)

Trivial merge