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

Trivial merge