Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 19 Aug 2014 08:20:12 +0000 (10:20 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 19 Aug 2014 08:20:12 +0000 (10:20 +0200)

Trivial merge