Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 18 Dec 2014 14:30:58 +0000 (15:30 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 18 Dec 2014 14:30:58 +0000 (15:30 +0100)

Trivial merge