Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 5 Jun 2014 13:09:54 +0000 (15:09 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 5 Jun 2014 13:09:54 +0000 (15:09 +0200)

Trivial merge