Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Sat, 25 Apr 2015 08:43:08 +0000 (10:43 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Sat, 25 Apr 2015 08:43:08 +0000 (10:43 +0200)

Trivial merge