Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 16:21:08 +0000 (17:21 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 16:21:08 +0000 (17:21 +0100)

Trivial merge