Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:19:55 +0000 (18:19 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:19:55 +0000 (18:19 +0200)

Trivial merge