Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 29 Oct 2014 15:12:15 +0000 (16:12 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 29 Oct 2014 15:12:15 +0000 (16:12 +0100)

Trivial merge