Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:54:55 +0000 (11:54 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:54:55 +0000 (11:54 +0200)

Trivial merge