Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 14 Aug 2014 17:39:59 +0000 (19:39 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 14 Aug 2014 17:39:59 +0000 (19:39 +0200)

Trivial merge