Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Mar 2014 14:57:19 +0000 (15:57 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Mar 2014 14:57:19 +0000 (15:57 +0100)

Trivial merge