Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 2 Jan 2015 13:20:49 +0000 (14:20 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 2 Jan 2015 13:20:49 +0000 (14:20 +0100)

Trivial merge