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

Trivial merge