Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Feb 2015 11:41:17 +0000 (12:41 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Feb 2015 11:41:17 +0000 (12:41 +0100)

Trivial merge