Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 18 Aug 2014 19:29:54 +0000 (21:29 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 18 Aug 2014 19:29:54 +0000 (21:29 +0200)

Trivial merge