Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 22 Apr 2015 17:35:19 +0000 (19:35 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 22 Apr 2015 17:35:19 +0000 (19:35 +0200)

Trivial merge